Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc
| --- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-11-27 21:12:25 UTC | --- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc | +++ src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc | ||||
| @@ -153,7 +153,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist | @@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist | ||||
| (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = | (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] = | ||||
| settings_api::PrefType::PREF_TYPE_BOOLEAN; | settings_api::PrefType::PREF_TYPE_BOOLEAN; | ||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| (*s_whitelist)[::prefs::kUseCustomChromeFrame] = | (*s_allowlist)[::prefs::kUseCustomChromeFrame] = | ||||
| settings_api::PrefType::PREF_TYPE_BOOLEAN; | settings_api::PrefType::PREF_TYPE_BOOLEAN; | ||||
| #endif | #endif | ||||
| @@ -163,7 +163,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist | @@ -179,7 +179,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist | ||||
| // Appearance settings. | // Appearance settings. | ||||
| (*s_whitelist)[::prefs::kCurrentThemeID] = | (*s_allowlist)[::prefs::kCurrentThemeID] = | ||||
| settings_api::PrefType::PREF_TYPE_STRING; | settings_api::PrefType::PREF_TYPE_STRING; | ||||
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| (*s_whitelist)[::prefs::kUsesSystemTheme] = | (*s_allowlist)[::prefs::kUsesSystemTheme] = | ||||
| settings_api::PrefType::PREF_TYPE_BOOLEAN; | settings_api::PrefType::PREF_TYPE_BOOLEAN; | ||||
| #endif | #endif | ||||