bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alloy: Disable ProxyErrorClient callbacks when extensions are disabled (fixes issue #2830)

This commit is contained in:
Marshall Greenblatt 2022-05-13 12:03:50 +03:00
parent 7702d96b33
commit 2dcee2ccfc
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patch.cfg
View File

@ -235,7 +235,13 @@ patches = [
'name': 'chrome_browser_extensions',
},
{
# Don't initialize ExtensionSystemFactory when extensions are disabled.
# alloy: Disable ProxyErrorClient callbacks when extensions are disabled.
# https://bitbucket.org/chromiumembedded/cef/issues/2830
'name': 'chrome_browser_net_proxy',
},
{
# alloy: Don't initialize ExtensionSystemFactory when extensions are
# disabled.
# https://bitbucket.org/chromiumembedded/cef/issues/2852
'name': 'chrome_browser_themes',
},

33
patch/patches/chrome_browser_net_proxy.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git chrome/browser/net/proxy_config_monitor.cc chrome/browser/net/proxy_config_monitor.cc
index 88fad9811069e..9973245011e24 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_CEF)
+#include "cef/libcef/common/extensions/extensions_util.h"
+#endif
+
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
#endif
@@ -89,6 +94,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
.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