mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-16 20:20:51 +01:00
b5d84c254d
Set enable_alloy_bootstrap=false to build with Alloy bootstrap code removed. Extension API is documented as deprecated in comments but not compiled out with this arg.
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
diff --git chrome/browser/net/proxy_config_monitor.cc chrome/browser/net/proxy_config_monitor.cc
|
|
index c9281f7abfbde..670872e610d88 100644
|
|
--- 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_ALLOY_BOOTSTRAP)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
|
|
#endif
|
|
@@ -92,6 +97,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
|
|
}
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
|
|
+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled())
|
|
+#endif
|
|
error_receiver_set_.Add(this, network_context_params->proxy_error_client
|
|
.InitWithNewPipeAndPassReceiver());
|
|
#endif
|