mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium to 98.0.4706.0 (main) (#31555)
* chore: bump chromium in DEPS to 97.0.4678.0
* chore: bump chromium in DEPS to 97.0.4679.0
* chore: bump chromium in DEPS to 97.0.4680.0
* chore: bump chromium in DEPS to 97.0.4681.0
* chore: bump chromium in DEPS to 97.0.4682.0
* chore: update patches
* 3234737: Disable -Wunused-but-set-variable
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* 3216953: Reland "Move task-related files from base/ to base/task/"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216953
* 3202710: TimeDelta factory function migration.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3202710
* 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3226841
* 3212165: blink/gin: changes blink to load snapshot based on runtime information
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3212165
* 3220292: Deprecate returning a GURL from GURL::GetOrigin()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3220292
* 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3231995
* 3205121: Remove base::DictionaryValue::GetDouble
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3205121
* 3208413: [flags] Make --js-flags settings have priority over V8 features
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3208413
* chore: bump chromium in DEPS to 97.0.4683.0
* chore: update patches
* 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3188834
* chore: update process_singleton patches
* chore: bump chromium in DEPS to 97.0.4684.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4685.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4686.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4687.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4688.0
* chore: update patches
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3223422
sync pepper_plugin_support.patch with upstream
* chore: bump chromium in DEPS to 97.0.4689.0
* 3247791: ax_mac_merge: Merge AX Math attribute implementations
Xref: ax_mac_merge: Merge AX Math attribute implementations
chore: fix minor patch shear in #includes
* 3243425: Add VisibleTimeRequestTrigger helper class
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3243425
chore: fix minor patch shear in #includes
* chore: regen chromium patches
* fixup! 3247722: Use correct source_site_instance if navigating via context menu
* chore: bump chromium in DEPS to 97.0.4690.0
* 3188659: Window Placement: make GetScreenInfo(s) const
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3188659
simple sync GetScreenInfo with upstream refactor
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4690.4
* chore: bump chromium in DEPS to 97.0.4692.0
* 3198073: ozone: //content: clean up from USE_X11
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3198073
Fixing patch shear. Nothing to see here.
* 3252338: Remove label images checkbox from chrome://accessibility page
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3252338
Part of our a11y patch is no longer needed due to upstream label removal
* 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3258183
Replace our use of the macro with explicitly-deleted class methods.
See https://chromium-review.googlesource.com/c/chromium/src/+/3256952
for upstream examples of this same replacement.
* chore: update patches
* 3247295: Unwind SecurityStyleExplanations
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3247295
update GetSecurityStyle() signature and impl to match upstream changes
* 3259578: media: grabs lock to ensure video output when occluded
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3259578
Add stub for new upstream virtual method OnCapturerCountChanged()
* fixup! 3247295: Unwind SecurityStyleExplanations
* 3238504: Fix up drag image is not shown from bookmark bar
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3238504
SetDragImage() no longer takes a widget argument
* 3217452: [devtools] Add getSyncInformation host binding
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3217452
Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled.
* chore: bump chromium in DEPS to 98.0.4693.0
* chore: bump chromium in DEPS to 98.0.4694.0
* chore: bump chromium in DEPS to 98.0.4695.0
* chore: bump chromium in DEPS to 98.0.4696.0
* chore: bump chromium in DEPS to 98.0.4697.0
* chore: bump chromium in DEPS to 98.0.4699.0
* chore: bump chromium in DEPS to 98.0.4701.0
* chore: bump chromium in DEPS to 98.0.4703.0
* chore: bump chromium in DEPS to 98.0.4705.0
* chore: bump chromium in DEPS to 98.0.4706.0
* chore: update patches
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs
https://chromium-review.googlesource.com/c/chromium/src/+/3259964
* 3269029: blink/gin: sets histogram callbacks during isolate creation
https://chromium-review.googlesource.com/c/chromium/src/+/3269029
* fixup after rebase
* [content] Make ContentMainParams and MainFunctionParams move-only
https://chromium-review.googlesource.com/c/chromium/src/+/3244976
* 3255305: Stop sending the securityStateChanged event and unwind
https://chromium-review.googlesource.com/c/chromium/src/+/3255305
* [Blink] Add promise support to WebLocalFrame::RequestExecuteScript()
https://chromium-review.googlesource.com/c/chromium/src/+/3230010
* 3256162: Simplify RWHV Show and ShowWithVisibility handling
https://chromium-review.googlesource.com/c/chromium/src/+/3256162
* 3263824: ozone: //ui/base: clean up from USE_X11 1/*
https://chromium-review.googlesource.com/c/chromium/src/+/3263824
* Request or cancel RecordContentToPresentationTimeRequest during capture
https://chromium-review.googlesource.com/c/chromium/src/+/3256802
* appcache: remove BrowsingData/quota references
https://chromium-review.googlesource.com/c/chromium/src/+/3255725
* [Autofill] Don't show Autofill dropdown if overlaps with permissions
https://chromium-review.googlesource.com/c/chromium/src/+/3236729
* Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks
https://chromium-review.googlesource.com/c/chromium/src/+/3268574
* cleanup patch
* fixup [content] Make ContentMainParams and MainFunctionParams move-only
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* ozone: //chrome/browser clean up from USE_X11
https://chromium-review.googlesource.com/c/chromium/src/+/3186490
Refs: https://github.com/electron/electron/issues/31382
* chore: update support_mixed_sandbox_with_zygote.patch
* Enable -Wunused-but-set-variable.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* fixup! ozone: //ui/base: clean up from USE_X11 1/*
* fixup! ozone: //chrome/browser clean up from USE_X11
* chore: fix deprecation warning in libuv
* chore: fixup for lint
* 3251161: Reland "Make the Clang update.py script require Python 3"
https://chromium-review.googlesource.com/c/chromium/src/+/3251161
* fixup: Enable -Wunused-but-set-variable.
* [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
https://chromium-review.googlesource.com/c/chromium/src/+/3262369
* Replace sandbox::policy::SandboxType with mojom Sandbox enum
https://chromium-review.googlesource.com/c/chromium/src/+/3213677
* fixup: [content] Make ContentMainParams and MainFunctionParams move-only
* build: ensure angle has a full git checkout available to it
* fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
* fixup lint
* [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame
https://chromium-review.googlesource.com/c/chromium/src/+/3223434
* fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions
* 3217591: Move browser UI CSS color parsing to own file part 2/2
https://chromium-review.googlesource.com/c/chromium/src/+/3217591
* Make kNoSandboxAndElevatedPrivileges only available to utilities
https://chromium-review.googlesource.com/c/chromium/src/+/3276784
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* Address review feedback
* chore: update patches
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* fix: unused variable compat
* chore: remove redundant patch
* fixup for 3262517: Re-enable WindowCaptureMacV2
https://chromium-review.googlesource.com/c/chromium/src/+/3262517
* chore: cleanup todo
The functions added in https://chromium-review.googlesource.com/c/chromium/src/+/3256802 are not used by offscreen rendering.
* fixup: update mas_no_private_api.patch
* 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216879 Fixes up commit b2f1aca956
* chore: cleanup support_mixed_sandbox_with_zygote.patch
* test: use window focus event instead of delay to wait for webContents focus
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
* chore: update patches
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
96 lines
3.5 KiB
Diff
96 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 583ae4a36a5dae700a8e11767839e4d9a5c6e9b4..2510362a4df21fd57c56ec1f336589ccde86694c 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_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);
|
|
@@ -56,6 +59,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
|
|
|
|
proxy_config_service_->AddObserver(this);
|
|
}
|
|
+#endif
|
|
|
|
ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
|
|
@@ -133,9 +137,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(
|
|
@@ -149,9 +155,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 cc48c2dcb98d49ea3737092e21fdf8a4aa52cb5b..3b82c21a956bebb6bedcbc47a1922eebb9b84f1a 100644
|
|
--- a/chrome/browser/net/proxy_config_monitor.h
|
|
+++ b/chrome/browser/net/proxy_config_monitor.h
|
|
@@ -39,11 +39,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|.
|
|
@@ -93,7 +94,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer,
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
mojo::ReceiverSet<network::mojom::ProxyErrorClient> error_receiver_set_;
|
|
- Profile* profile_ = nullptr;
|
|
+ // Profile* profile_ = nullptr;
|
|
#endif
|
|
};
|
|
|