diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_pref__names.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 4df741a42ea7..e4c8113e20d9 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,24 +1,24 @@ ---- chrome/common/pref_names.cc.orig 2021-01-18 21:28:52 UTC +--- chrome/common/pref_names.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/common/pref_names.cc -@@ -1089,7 +1089,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y - // only using an account that belongs to one of the domains from this pref. - const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; +@@ -1099,7 +1099,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1246,7 +1246,7 @@ const char kShowUpdatePromotionInfoBar[] = - "browser.show_update_promotion_info_bar"; - #endif +@@ -1274,7 +1274,7 @@ const char kShowUpdatePromotionInfoBar[] = --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1687,7 +1687,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1726,7 +1726,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -2044,12 +2044,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2103,12 +2103,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -42,12 +42,12 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2955,7 +2955,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit - const char kBlockAutoplayEnabled[] = "media.block_autoplay"; - #endif // !defined(OS_ANDROID) +@@ -3001,7 +3001,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Boolean that indicates if native notifications are allowed to be used in // place of Chrome notifications. const char kAllowNativeNotifications[] = "native_notifications.allowed"; |