diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index c393ceb5d02d..aaa30d1ce8ac 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,20 +1,24 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* +@@ -26,7 +26,7 @@ namespace { + // Old values: 0 = SHRINK (default), 1 = STACKED. + const char kTabStripLayoutType[] = "tab_strip_layout_type"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + bool GetCustomFramePrefDefault() { + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) { +@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - bool custom_frame_pref_default = false; - #if defined(USE_X11) - custom_frame_pref_default = ui::GetCustomFramePrefDefault(); -@@ -45,7 +45,7 @@ void RegisterBrowserViewProfilePrefs( - #endif ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, - custom_frame_pref_default); --#endif // OS_LINUX && !OS_CHROMEOS -+#endif // (OS_LINUX && !OS_CHROMEOS) || defined(OS_BSD) + GetCustomFramePrefDefault()); +-#endif // defined(OS_LINUX) && defined(!OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS) } void MigrateBrowserTabStripPrefs(PrefService* prefs) { |