5261e08d0c
* chore: bump chromium in DEPS to 113.0.5657.0 * chore: bump chromium in DEPS to 113.0.5660.0 * chore: update patches printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/4347664 https://chromium-review.googlesource.com/c/chromium/src/+/4347664 https://chromium-review.googlesource.com/c/chromium/src/+/4338810 https://chromium-review.googlesource.com/c/chromium/src/+/4339496 mas_disable_remote_layer.patch https://chromium-review.googlesource.com/c/chromium/src/+/4334544 https://chromium-review.googlesource.com/c/chromium/src/+/4335299 * Add API to verify `TOP_LEVEL_STORAGE_ACCESS` permission status https://chromium-review.googlesource.com/c/chromium/src/+/4306712 * Move os_crypt into a sync/ subdirectory. https://chromium-review.googlesource.com/c/chromium/src/+/4336304 * chore: generate libc++ headers --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
95 lines
3.5 KiB
Diff
95 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 18 Oct 2018 17:07:12 -0700
|
|
Subject: proxy_config_monitor.patch
|
|
|
|
Allow monitoring proxy config changes for a pref service.
|
|
|
|
diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
|
|
index 6dc5622f50847e35d66eff8b34b4888aa6c4ca90..dcbf445709d0511b84ea647892d12266f6be446a 100644
|
|
--- a/chrome/browser/net/proxy_config_monitor.cc
|
|
+++ b/chrome/browser/net/proxy_config_monitor.cc
|
|
@@ -11,7 +11,9 @@
|
|
#include "build/chromeos_buildflags.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/net/proxy_service_factory.h"
|
|
+#if 0
|
|
#include "chrome/browser/profiles/profile.h"
|
|
+#endif
|
|
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "mojo/public/cpp/bindings/pending_remote.h"
|
|
@@ -22,12 +24,13 @@
|
|
#include "chrome/browser/ash/profiles/profile_helper.h"
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
-#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if 0
|
|
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
|
|
#endif
|
|
|
|
using content::BrowserThread;
|
|
|
|
+#if 0
|
|
ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
DCHECK(profile);
|
|
@@ -58,6 +61,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
|
|
|
|
proxy_config_service_->AddObserver(this);
|
|
}
|
|
+#endif
|
|
|
|
ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
|
|
@@ -139,9 +143,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
|
|
void ProxyConfigMonitor::OnPACScriptError(int32_t line_number,
|
|
const std::string& details) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
+#if 0
|
|
extensions::ProxyEventRouter::GetInstance()->OnPACScriptError(
|
|
g_browser_process->extension_event_router_forwarder(), profile_,
|
|
line_number, base::UTF8ToUTF16(details));
|
|
+#endif
|
|
}
|
|
|
|
void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
|
|
@@ -155,9 +161,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
|
|
// controlled.
|
|
return;
|
|
}
|
|
-
|
|
+#if 0
|
|
extensions::ProxyEventRouter::GetInstance()->OnProxyError(
|
|
g_browser_process->extension_event_router_forwarder(), profile_,
|
|
net_error);
|
|
+#endif
|
|
}
|
|
#endif
|
|
diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
|
|
index c808604a9b586eb5524a10b7561987e5b29747ea..68980ce4bf50d6bde5329f6d45209be86d878769 100644
|
|
--- a/chrome/browser/net/proxy_config_monitor.h
|
|
+++ b/chrome/browser/net/proxy_config_monitor.h
|
|
@@ -40,11 +40,12 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
|
|
|
{
|
|
public:
|
|
+#if 0
|
|
// Creates a ProxyConfigMonitor that gets proxy settings from |profile| and
|
|
// watches for changes. The created ProxyConfigMonitor must be destroyed
|
|
// before |profile|.
|
|
explicit ProxyConfigMonitor(Profile* profile);
|
|
-
|
|
+#endif
|
|
// Creates a ProxyConfigMonitor that gets proxy settings from the
|
|
// |local_state|, for use with NetworkContexts not
|
|
// associated with a profile. Must be destroyed before |local_state|.
|
|
@@ -94,7 +95,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
|
|
- raw_ptr<Profile> profile_ = nullptr;
|
|
+ // raw_ptr<Profile> profile_ = nullptr;
|
|
#endif
|
|
};
|
|
|