Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1257)

Unified Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 1841973004: [MD settings] theme name shown in sub-label, wallpaper chrome os only (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review changes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index a509bbf20996a5ce4b2b3454aa47bc685e39c8b5..32a766aa48644d965c8baf0eb0637c79eb2ffaba 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -70,6 +70,24 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
(*s_whitelist)["browser.show_home_button"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ // Appearance settings.
+ (*s_whitelist)["extensions.theme.id"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+ (*s_whitelist)["webkit.webprefs.default_font_size"] =
+ settings_private::PrefType::PREF_TYPE_NUMBER;
+ (*s_whitelist)["webkit.webprefs.minimum_font_size"] =
+ settings_private::PrefType::PREF_TYPE_NUMBER;
+ (*s_whitelist)["webkit.webprefs.fonts.fixed.Zyyy"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+ (*s_whitelist)["webkit.webprefs.fonts.sansserif.Zyyy"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+ (*s_whitelist)["webkit.webprefs.fonts.serif.Zyyy"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+ (*s_whitelist)["webkit.webprefs.fonts.standard.Zyyy"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+ (*s_whitelist)["intl.charset_default"] =
+ settings_private::PrefType::PREF_TYPE_STRING;
+
// Downloads settings.
(*s_whitelist)["download.default_directory"] =
settings_private::PrefType::PREF_TYPE_STRING;
@@ -166,22 +184,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
(*s_whitelist)["profile.content_settings.exceptions.popups"] =
settings_private::PrefType::PREF_TYPE_DICTIONARY;
- // Web content settings.
- (*s_whitelist)["webkit.webprefs.default_font_size"] =
- settings_private::PrefType::PREF_TYPE_NUMBER;
- (*s_whitelist)["webkit.webprefs.minimum_font_size"] =
- settings_private::PrefType::PREF_TYPE_NUMBER;
- (*s_whitelist)["webkit.webprefs.fonts.fixed.Zyyy"] =
- settings_private::PrefType::PREF_TYPE_STRING;
- (*s_whitelist)["webkit.webprefs.fonts.sansserif.Zyyy"] =
- settings_private::PrefType::PREF_TYPE_STRING;
- (*s_whitelist)["webkit.webprefs.fonts.serif.Zyyy"] =
- settings_private::PrefType::PREF_TYPE_STRING;
- (*s_whitelist)["webkit.webprefs.fonts.standard.Zyyy"] =
- settings_private::PrefType::PREF_TYPE_STRING;
- (*s_whitelist)["intl.charset_default"] =
- settings_private::PrefType::PREF_TYPE_STRING;
-
#if defined(OS_CHROMEOS)
(*s_whitelist)["cros.accounts.allowBWSI"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698