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

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

Issue 2258553004: Add pref to enable/disable palette tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Rebase Created 4 years, 4 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
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 76337e8981ddb10403eb9517a842cbb093c41adb..c36ea6d095081fc3b567d75dc4d7461b03919927 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -254,13 +254,17 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
(*s_whitelist)["settings.enable_screen_lock"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ // Ash settings.
+ (*s_whitelist)["settings.enable_stylus_tools"] =
+ settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ (*s_whitelist)["settings.launch_palette_on_eject_event"] =
+ settings_private::PrefType::PREF_TYPE_BOOLEAN;
+
// Input method settings.
(*s_whitelist)["settings.language.preload_engines"] =
settings_private::PrefType::PREF_TYPE_STRING;
(*s_whitelist)["settings.language.enabled_extension_imes"] =
settings_private::PrefType::PREF_TYPE_STRING;
- (*s_whitelist)["settings.launch_palette_on_eject_event"] =
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
// Device settings.
(*s_whitelist)["settings.touchpad.enable_tap_to_click"] =
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/resources/options/chromeos/stylus_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698