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

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

Issue 2688793002: MD Settings: Update Protected Content for redesign (Closed)
Patch Set: fix closure issues Created 3 years, 10 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/extensions/settings_api_helpers.h" 10 #include "chrome/browser/extensions/settings_api_helpers.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 (*s_whitelist)[::prefs::kHomePage] = 100 (*s_whitelist)[::prefs::kHomePage] =
101 settings_private::PrefType::PREF_TYPE_URL; 101 settings_private::PrefType::PREF_TYPE_URL;
102 (*s_whitelist)[::prefs::kHomePageIsNewTabPage] = 102 (*s_whitelist)[::prefs::kHomePageIsNewTabPage] =
103 settings_private::PrefType::PREF_TYPE_BOOLEAN; 103 settings_private::PrefType::PREF_TYPE_BOOLEAN;
104 (*s_whitelist)[::prefs::kWebKitDefaultFixedFontSize] = 104 (*s_whitelist)[::prefs::kWebKitDefaultFixedFontSize] =
105 settings_private::PrefType::PREF_TYPE_NUMBER; 105 settings_private::PrefType::PREF_TYPE_NUMBER;
106 (*s_whitelist)[::prefs::kWebKitDefaultFontSize] = 106 (*s_whitelist)[::prefs::kWebKitDefaultFontSize] =
107 settings_private::PrefType::PREF_TYPE_NUMBER; 107 settings_private::PrefType::PREF_TYPE_NUMBER;
108 (*s_whitelist)[::prefs::kWebKitMinimumFontSize] = 108 (*s_whitelist)[::prefs::kWebKitMinimumFontSize] =
109 settings_private::PrefType::PREF_TYPE_NUMBER; 109 settings_private::PrefType::PREF_TYPE_NUMBER;
110 (*s_whitelist)[::prefs::kWebKitEncryptedMediaEnabled] =
111 settings_private::PrefType::PREF_TYPE_BOOLEAN;
110 (*s_whitelist)[::prefs::kWebKitFixedFontFamily] = 112 (*s_whitelist)[::prefs::kWebKitFixedFontFamily] =
111 settings_private::PrefType::PREF_TYPE_STRING; 113 settings_private::PrefType::PREF_TYPE_STRING;
112 (*s_whitelist)[::prefs::kWebKitSansSerifFontFamily] = 114 (*s_whitelist)[::prefs::kWebKitSansSerifFontFamily] =
113 settings_private::PrefType::PREF_TYPE_STRING; 115 settings_private::PrefType::PREF_TYPE_STRING;
114 (*s_whitelist)[::prefs::kWebKitSerifFontFamily] = 116 (*s_whitelist)[::prefs::kWebKitSerifFontFamily] =
115 settings_private::PrefType::PREF_TYPE_STRING; 117 settings_private::PrefType::PREF_TYPE_STRING;
116 (*s_whitelist)[::prefs::kWebKitStandardFontFamily] = 118 (*s_whitelist)[::prefs::kWebKitStandardFontFamily] =
117 settings_private::PrefType::PREF_TYPE_STRING; 119 settings_private::PrefType::PREF_TYPE_STRING;
118 (*s_whitelist)[::prefs::kDefaultCharset] = 120 (*s_whitelist)[::prefs::kDefaultCharset] =
119 settings_private::PrefType::PREF_TYPE_STRING; 121 settings_private::PrefType::PREF_TYPE_STRING;
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled) 733 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)
732 return GetExtensionOverridingSearchEngine(profile_); 734 return GetExtensionOverridingSearchEngine(profile_);
733 735
734 if (pref_object.key == proxy_config::prefs::kProxy) 736 if (pref_object.key == proxy_config::prefs::kProxy)
735 return GetExtensionOverridingProxy(profile_); 737 return GetExtensionOverridingProxy(profile_);
736 738
737 return nullptr; 739 return nullptr;
738 } 740 }
739 741
740 } // namespace extensions 742 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/privacy_page/compiled_resources2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698