mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
* chore: bump chromium in DEPS to 144.0.7543.0 * Pass PipScreenCaptureCoordinatorProxy to ScreenCaptureKitDeviceMac https://chromium-review.googlesource.com/c/chromium/src/+/7157590 * chore: update patches * chore: update filenames.libcxx.gni * 7142359: Spanification of process_singleton_posix.cc https: //chromium-review.googlesource.com/c/chromium/src/+/7142359 Co-Authored-By: Charles Kerr <70381+ckerr@users.noreply.github.com> * Move logging::LoggingSettings to base/logging/logging_settings.h https://chromium-review.googlesource.com/c/chromium/src/+/7173024 * chore: bump chromium in DEPS to 144.0.7545.0 * 7159368: update PluginService API for sync GetPlugins Upstream removed async PluginService APIs: - GetPluginsAsync() removed, use synchronous GetPlugins() - RegisterInternalPlugin() now takes single argument (remove add_at_beginning) - RefreshPlugins() removed entirely Updated ElectronPluginInfoHostImpl to use synchronous plugin loading and simplified ElectronBrowserMainParts internal plugin registration. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159368 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159328 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159056 (cherry picked from commit88cdf50b0a) * 7159184: add missing base/files/file_path.h include Add explicit include for base/files/file_path.h in electron_browser_context.h. After removal of superfluous Mojo includes from content headers, base::FilePath is no longer transitively included via content/public/browser/browser_context.h. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7159184 (cherry picked from commit6ca8ea03ec) * 7126479: add ShouldForceRefreshTextCheckService parameter to SpellCheckClient Upstream added a force-refresh parameter to WebTextCheckClient::RequestCheckingOfText to bypass spell check cache. Add the new ShouldForceRefreshTextCheckService parameter to SpellCheckClient's override (currently unused in Electron). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7126479 (cherry picked from commit879c0401c4) * 7083663: remove fingerprinting_protection_ruleset_service override Upstream deleted external references to Fingerprinting Protection Filter (FPF) component. Remove the fingerprinting_protection_ruleset_service() override from BrowserProcessImpl as the method no longer exists in the base class. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7083663 (cherry picked from commit8350d152f9) * 7155287: implement WebContentsView::GetSize and Resize Upstream delegated WebContents::GetSize() and Resize() to WebContentsView, making them pure virtual. Add const qualifier to GetSize() and implement the Resize() override in OffScreenWebContentsView (no-op for offscreen). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7155287 (cherry picked from commit084eaa568e) * 7184238: add OnUnconfirmedTapConvertedToTap override Upstream added OnUnconfirmedTapConvertedToTap as a pure virtual method to RenderWidgetHostViewBase to inform root view when child frame converts an unconfirmed tap. Add empty override for offscreen rendering. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7184238 (cherry picked from commitef03400d9a) * 7143586: add widget parameter to OnCommandsChanged GlobalAcceleratorListener::OnCommandsChanged gained a gfx::AcceleratedWidget parameter for window association in the GlobalShortcutListenerLinux implementation. Pass gfx::kNullAcceleratedWidget for Electron's usage. Ref: : Pass parent handle to GlobalAcceleratorListenerLinux::BindShortcuts | https://chromium-review.googlesource.com/c/chromium/src/+/7143586 (cherry picked from commit38306e2bfc) Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> * chore: update patches Co-Authored-By: Samuel Attard <MarshallOfSound@users.noreply.github.com> * chore: bump chromium in DEPS to 144.0.7547.0 * chore: update patches * 7189232: Add support for UnownedUserData in GlobalFeatures https: //chromium-review.googlesource.com/c/chromium/src/+/7189232 * Refactor: Use std::u16string for extension load error messages https://chromium-review.googlesource.com/c/chromium/src/+/7185844 * fixup Add support for UnownedUserData in GlobalFeatures * 7165650: Remove ResourceContext https://chromium-review.googlesource.com/c/chromium/src/+/7165650 * fixup BUILD.gn for lint * 7202164: Reland "Reland "Remove GenericScopedHandle:IsValid"" https://chromium-review.googlesource.com/c/chromium/src/+/7202164 * advance deprecation of v8::ReturnValue<void>::Set(Local<S>). 7168624: [runtime][api] Relax requirements for setter/definer/deleter callbacks | https://chromium-review.googlesource.com/c/v8/v8/+/7168624 * fixup advance deprecation of v8::ReturnValue<void>::Set(Local<S>) * chore: skip setting LPAC ACLs * Revert "chore: skip setting LPAC ACLs" This reverts commite187aec488. * chore: revert Convert to UNSAFE_TODO in sandbox revert https://chromium-review.googlesource.com/c/chromium/src/+/7131661 to see if it fixes the Windows sandbox issue. * Revert "chore: revert Convert to UNSAFE_TODO in sandbox" This reverts commit57afbfefe5. * chore: Revert "Enable network sandbox by default on Windows" see if this fixes the Windows sandbox issue * Enable network sandbox by default on Windows https://chromium-review.googlesource.com/c/chromium/src/+/7204292 * Revert "chore: Revert "Enable network sandbox by default on Windows"" This reverts commit530ab6af82. * fixup! Enable network sandbox by default on Windows | https://chromium-review.googlesource.com/c/chromium/src/+/7204292 * fixup!: Correct flag name, add kLocalNetworkAccessChecks to all platforms --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <70381+ckerr@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@anthropic.com> Co-authored-by: Samuel Attard <MarshallOfSound@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
127 lines
5.2 KiB
Diff
127 lines
5.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Wed, 17 May 2023 14:42:09 -0500
|
|
Subject: chore: patch out Profile methods
|
|
|
|
Electron does not support Profiles, so we need to patch it out of any
|
|
code that we use.
|
|
|
|
diff --git a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
index dee03f1b42e04cf3081aa58b858251ec38833efe..256b0559d0424682f25ed2653f67ada2679f0d25 100644
|
|
--- a/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
+++ b/chrome/browser/pdf/chrome_pdf_stream_delegate.cc
|
|
@@ -45,6 +45,7 @@ namespace {
|
|
// hierarchy is: enterprise policy > user choice > finch experiment.
|
|
bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
|
|
CHECK(contents);
|
|
+#if 0
|
|
const PrefService* prefs =
|
|
Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs();
|
|
|
|
@@ -52,6 +53,7 @@ bool ShouldEnableSkiaRenderer(content::WebContents* contents) {
|
|
if (prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
|
|
return prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
|
|
}
|
|
+#endif
|
|
|
|
// When the enterprise policy is not set, use finch/feature flag choice.
|
|
return base::FeatureList::IsEnabled(
|
|
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
|
|
index 328abdd79d287225d0e6ec6becc455e169d6e5d0..10e5e702a43dbb70e13d00b48000e0b4cc974e7a 100644
|
|
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
|
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
|
@@ -248,10 +248,13 @@ bool IsPrintingEnabled(content::BrowserContext* context) {
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_INK2)
|
|
bool IsPdfAnnotationsEnabledByPolicy(content::BrowserContext* context) {
|
|
+# if 0
|
|
PrefService* prefs =
|
|
context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
return !prefs || !prefs->IsManagedPreference(prefs::kPdfAnnotationsEnabled) ||
|
|
prefs->GetBoolean(prefs::kPdfAnnotationsEnabled);
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
#endif // BUILDFLAG(ENABLE_PDF_INK2)
|
|
|
|
diff --git a/chrome/browser/profiles/profile_selections.cc b/chrome/browser/profiles/profile_selections.cc
|
|
index bc0bad82ebcdceadc505e912ff27202b452fefab..6b77c57fccc4619a1df3b4ed661d2bdd60960228 100644
|
|
--- a/chrome/browser/profiles/profile_selections.cc
|
|
+++ b/chrome/browser/profiles/profile_selections.cc
|
|
@@ -13,6 +13,7 @@
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
|
|
+#if 0
|
|
// By default disable all services for System Profile.
|
|
// Even though having no services is also the default value for Guest Profile,
|
|
// this is not really the case in practice because a lot of Service Factories
|
|
@@ -20,7 +21,7 @@ bool AreKeyedServicesDisabledForProfileByDefault(const Profile* profile) {
|
|
if (profile && profile->IsSystemProfile()) {
|
|
return true;
|
|
}
|
|
-
|
|
+#endif
|
|
return false;
|
|
}
|
|
|
|
@@ -104,6 +105,7 @@ ProfileSelections ProfileSelections::BuildRedirectedInIncognito() {
|
|
}
|
|
|
|
Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
|
|
+#if 0
|
|
CHECK(profile);
|
|
|
|
ProfileSelection selection = GetProfileSelection(profile);
|
|
@@ -119,6 +121,9 @@ Profile* ProfileSelections::ApplyProfileSelection(Profile* profile) const {
|
|
case ProfileSelection::kOffTheRecordOnly:
|
|
return profile->IsOffTheRecord() ? profile : nullptr;
|
|
}
|
|
+#else
|
|
+ return nullptr;
|
|
+#endif
|
|
}
|
|
|
|
ProfileSelection ProfileSelections::GetProfileSelection(
|
|
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
|
|
index f8a36ced14288698849cd5730309e29d47d3d1d4..97b8fc0f38650e816bcae00e074543766f71e0d0 100644
|
|
--- a/chrome/browser/spellchecker/spellcheck_service.cc
|
|
+++ b/chrome/browser/spellchecker/spellcheck_service.cc
|
|
@@ -21,8 +21,10 @@
|
|
#include "base/synchronization/waitable_event.h"
|
|
#include "base/values.h"
|
|
#include "build/build_config.h"
|
|
+#if 0
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/profiles/profiles_state.h"
|
|
+#endif
|
|
#include "chrome/browser/spellchecker/spellcheck_factory.h"
|
|
#include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h"
|
|
#include "components/language/core/browser/pref_names.h"
|
|
@@ -67,7 +69,10 @@ SpellcheckService::SpellCheckerBinder& GetSpellCheckerBinderOverride() {
|
|
// Only record spelling-configuration metrics for profiles in which the user
|
|
// can configure spelling.
|
|
bool RecordSpellingConfigurationMetrics(content::BrowserContext* context) {
|
|
+#if 0
|
|
return profiles::IsRegularUserProfile(Profile::FromBrowserContext(context));
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
|
|
} // namespace
|
|
diff --git a/chrome/browser/win/titlebar_config.cc b/chrome/browser/win/titlebar_config.cc
|
|
index 7898ea88ca529660e52c1f9e2517d6f016b740a5..114046912999f4ca9d21f7d5859d14ecaaab9f56 100644
|
|
--- a/chrome/browser/win/titlebar_config.cc
|
|
+++ b/chrome/browser/win/titlebar_config.cc
|
|
@@ -12,8 +12,10 @@
|
|
|
|
bool ShouldBrowserCustomDrawTitlebar(BrowserView* browser_view) {
|
|
return !ShouldDefaultThemeUseMicaTitlebar() ||
|
|
+#if 0
|
|
!ThemeServiceFactory::GetForProfile(browser_view->GetProfile())
|
|
->UsingSystemTheme() ||
|
|
+#endif
|
|
(!browser_view->browser()->is_type_normal() &&
|
|
!browser_view->browser()->is_type_popup() &&
|
|
!browser_view->browser()->is_type_devtools());
|