mirror of
https://github.com/electron/electron.git
synced 2026-01-07 22:54:25 -05:00
* chore: bump chromium in DEPS to 140.0.7296.0 * chore: update patches * 6702959: Remove OwnedByWidgetPassKey usage from content analysis dialog tests | https://chromium-review.googlesource.com/c/chromium/src/+/6702959 * 6722750: Remove un-used `stream_id` argument for `AidaCodeComplete` | https://chromium-review.googlesource.com/c/chromium/src/+/6722750 * 6696478: Reland Reland [video pip] Add fade in/out animation to controls visibility changes | https://chromium-review.googlesource.com/c/chromium/src/+/6696478 * chore: update libc++-filenames * build: explicitly include cstdlib in Boyer-Moore patch * chore: bump chromium in DEPS to 140.0.7297.0 * chore: update patches * 6729537: [FPF] Pipe flag state from the browser to the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6729537 * 6727996: [Win] Detect pre-IPC crashes in sandboxed utility processes | https://chromium-review.googlesource.com/c/chromium/src/+/6727996 * 6707182: Move wtf/cross_thread_copier*.* to "blink" namespace | https://chromium-review.googlesource.com/c/chromium/src/+/6707182 * 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796 * chore: bump chromium in DEPS to 140.0.7299.0 * chore: update patches * chore: update main patches * build: reset the minimum macOS SDK to 15 to match upstream This reverts commit499e987c77. * 6730215: Remove IPC_MESSAGE_LOG_ENABLED ifdef blocks. | https://chromium-review.googlesource.com/c/chromium/src/+/6730215 * 6690442: Delete ppapi/buildflags/buildflags.h | https://chromium-review.googlesource.com/c/chromium/src/+/6690442 * [wip]: 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681 * chore: bump chromium in DEPS to 140.0.7301.0 * chore: update patches * 6656309: extensions: Port proxy API to desktop Android | https://chromium-review.googlesource.com/c/chromium/src/+/6656309 * 6758510: Reland 'Move GN enable_plugins variable out of //ppapi' | https://chromium-review.googlesource.com/c/chromium/src/+/6758510 * 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466 * 6735979: [FSA] Replace `request_writable` with a new enum `FileSystemAccessPermissionMode`. | https://chromium-review.googlesource.com/c/chromium/src/+/6735979 * 6712080: Reland "Turn on gender translation PAK generation everywhere" | https://chromium-review.googlesource.com/c/chromium/src/+/6712080 * 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796 * build: restore minimum macOS SDK to 10, restore patch This reverts commita04c579b99. * fixup! 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466 * chore: correct node patches * fixup! 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
93 lines
3.5 KiB
Diff
93 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 50e7a07af841ff55cd24c0a79eef5dcc68807933..ed40ecdb91ddd7139f8f463809594ddfca793fcc 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"
|
|
@@ -21,12 +23,13 @@
|
|
#include "chrome/browser/ash/profiles/profile_helper.h"
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
|
+#if 0
|
|
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
|
|
|
using content::BrowserThread;
|
|
|
|
+#if 0
|
|
ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
DCHECK(profile);
|
|
@@ -57,6 +60,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
|
|
|
|
proxy_config_service_->AddObserver(this);
|
|
}
|
|
+#endif
|
|
|
|
ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
|
|
@@ -135,8 +139,10 @@ 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(
|
|
profile_, line_number, base::UTF8ToUTF16(details));
|
|
+#endif
|
|
}
|
|
|
|
void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
|
|
@@ -151,7 +157,9 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
|
|
return;
|
|
}
|
|
|
|
+#if 0
|
|
extensions::ProxyEventRouter::GetInstance()->OnProxyError(profile_,
|
|
net_error);
|
|
+#endif
|
|
}
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
|
diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
|
|
index 6c060b52d25799c6a7c4e4ee86ed7490060560d6..c81481a4451ff50b6ace5372a68b8615819affb3 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_CORE)
|
|
mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
|
|
- raw_ptr<Profile> profile_ = nullptr;
|
|
+ // raw_ptr<Profile> profile_ = nullptr;
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
|
};
|
|
|