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

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

Issue 2499483002: MD Settings: Internet: Allow Shared Proxies (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 9cb236dc7b63d1a4f1d11fa9e7b8f0f35aef638a..7dec478ae1a198848485b69d6fb102008df7c558 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -189,6 +189,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_NUMBER;
#if defined(OS_CHROMEOS)
+ // Accounts / Users / People.
(*s_whitelist)[chromeos::kAccountsPrefAllowGuest] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[chromeos::kAccountsPrefSupervisedUsersEnabled] =
@@ -199,6 +200,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[chromeos::kAccountsPrefUsers] =
settings_private::PrefType::PREF_TYPE_LIST;
+ (*s_whitelist)[::prefs::kEnableAutoScreenLock] =
+ settings_private::PrefType::PREF_TYPE_BOOLEAN;
+
+ // Accessibility.
(*s_whitelist)[::prefs::kAccessibilitySpokenFeedbackEnabled] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[::prefs::kAccessibilityAutoclickEnabled] =
@@ -229,6 +234,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[::prefs::kAccessibilityMonoAudioEnabled] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
+
+ // Misc.
(*s_whitelist)[::prefs::kUse24HourClock] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[::prefs::kLanguagePreferredLanguages] =
@@ -237,14 +244,16 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[chromeos::kStatsReportingPref] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ (*s_whitelist)[chromeos::kAttestationForContentProtectionEnabled] =
+ settings_private::PrefType::PREF_TYPE_BOOLEAN;
+
+ // Bluetooth & Internet settings.
(*s_whitelist)[chromeos::kAllowBluetooth] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
- (*s_whitelist)[chromeos::kAttestationForContentProtectionEnabled] =
+ (*s_whitelist)[proxy_config::prefs::kUseSharedProxies] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[::prefs::kWakeOnWifiDarkConnect] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
- (*s_whitelist)[::prefs::kEnableAutoScreenLock] =
- settings_private::PrefType::PREF_TYPE_BOOLEAN;
// Timezone settings.
(*s_whitelist)[chromeos::kSystemTimezone] =
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698