From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Charles Kerr 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 e3b9f14a4cf2167064ce6716053e663adffa1542..65f13a4607c8145858fd47d81cb9960c44272d79 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 ecacb93a2eb0765e43ac984498b72a5d0900e669..dc9870130befc742287475cf05b4caa00413d6f3 100644 --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc @@ -245,10 +245,13 @@ bool IsPrintingEnabled(content::BrowserContext* context) { #if BUILDFLAG(IS_CHROMEOS) || 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(IS_CHROMEOS) || 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 4c52386f9ddf13f1453903cda3954b6c596028f2..8fbb2025d157e58c90c701f9e3478f6c99b88aa1 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());