2022-05-13 11:03:50 +02:00
|
|
|
diff --git chrome/browser/net/proxy_config_monitor.cc chrome/browser/net/proxy_config_monitor.cc
|
2022-09-26 21:30:45 +02:00
|
|
|
index 34584b4400276..809b175ff26de 100644
|
2022-05-13 11:03:50 +02:00
|
|
|
--- chrome/browser/net/proxy_config_monitor.cc
|
|
|
|
|
+++ chrome/browser/net/proxy_config_monitor.cc
|
|
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
|
|
|
#include "build/build_config.h"
|
|
|
|
|
#include "build/chromeos_buildflags.h"
|
|
|
|
|
+#include "cef/libcef/features/runtime.h"
|
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
|
#include "chrome/browser/net/proxy_service_factory.h"
|
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
|
|
@@ -21,6 +22,10 @@
|
|
|
|
|
#include "chrome/browser/ash/profiles/profile_helper.h"
|
|
|
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
|
|
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
|
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
|
|
|
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
|
|
|
|
|
#endif
|
2022-05-19 12:28:44 +02:00
|
|
|
@@ -90,6 +95,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
|
2022-05-13 11:03:50 +02:00
|
|
|
.InitWithNewPipeAndPassReceiver());
|
|
|
|
|
|
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
|
|
|
+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled())
|
|
|
|
|
+#endif
|
|
|
|
|
error_receiver_set_.Add(this, network_context_params->proxy_error_client
|
|
|
|
|
.InitWithNewPipeAndPassReceiver());
|
|
|
|
|
#endif
|
