diff options
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc')
| -rw-r--r-- | www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc index 25d043976429..0a9c917bd8ba 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,29 +1,37 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2023-10-21 11:51:27 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -25,7 +25,7 @@ +@@ -27,11 +27,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/themes/theme_service_aura_linux.h" - #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -82,7 +82,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui_factory.h" + #endif + +@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; + + KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) using ThemeService = ThemeServiceAuraLinux; #endif -@@ -96,7 +96,7 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - bool default_uses_system_theme = false; - - const views::LinuxUI* linux_ui = views::LinuxUI::instance(); + ui::SystemTheme default_system_theme = ui::SystemTheme::kDefault; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + default_system_theme = ui::GetDefaultSystemTheme(); + #endif + registry->RegisterIntegerPref(prefs::kSystemTheme, |