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

Side by Side Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 2180393002: MD Settings: made proxy button respect policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@controlled-button
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/settings_private/prefs_util.h" 5 #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/chrome_extension_function.h" 9 #include "chrome/browser/extensions/chrome_extension_function.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 settings_private::PrefType::PREF_TYPE_NUMBER; 289 settings_private::PrefType::PREF_TYPE_NUMBER;
290 #else 290 #else
291 (*s_whitelist)["intl.accept_languages"] = 291 (*s_whitelist)["intl.accept_languages"] =
292 settings_private::PrefType::PREF_TYPE_STRING; 292 settings_private::PrefType::PREF_TYPE_STRING;
293 293
294 // System settings. 294 // System settings.
295 (*s_whitelist)["background_mode.enabled"] = 295 (*s_whitelist)["background_mode.enabled"] =
296 settings_private::PrefType::PREF_TYPE_BOOLEAN; 296 settings_private::PrefType::PREF_TYPE_BOOLEAN;
297 (*s_whitelist)["hardware_acceleration_mode.enabled"] = 297 (*s_whitelist)["hardware_acceleration_mode.enabled"] =
298 settings_private::PrefType::PREF_TYPE_BOOLEAN; 298 settings_private::PrefType::PREF_TYPE_BOOLEAN;
299 (*s_whitelist)["proxy"] = settings_private::PrefType::PREF_TYPE_DICTIONARY;
299 #endif 300 #endif
300 301
301 #if defined(GOOGLE_CHROME_BUILD) 302 #if defined(GOOGLE_CHROME_BUILD)
302 (*s_whitelist)["media_router.cloudservices.enabled"] = 303 (*s_whitelist)["media_router.cloudservices.enabled"] =
303 settings_private::PrefType::PREF_TYPE_BOOLEAN; 304 settings_private::PrefType::PREF_TYPE_BOOLEAN;
304 #endif // defined(GOOGLE_CHROME_BUILD) 305 #endif // defined(GOOGLE_CHROME_BUILD)
305 306
306 return *s_whitelist; 307 return *s_whitelist;
307 } 308 }
308 309
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 650
650 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) { 651 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) {
651 #if defined(OS_CHROMEOS) 652 #if defined(OS_CHROMEOS)
652 return CrosSettings::Get()->IsCrosSettings(pref_name); 653 return CrosSettings::Get()->IsCrosSettings(pref_name);
653 #else 654 #else
654 return false; 655 return false;
655 #endif 656 #endif
656 } 657 }
657 658
658 } // namespace extensions 659 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698