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

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

Issue 2673783002: MD Settings: Add Protected Content toggle to Site Settings (Closed)
Patch Set: address comments 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 (*s_whitelist)[::prefs::kDefaultSearchProviderEnabled] = 166 (*s_whitelist)[::prefs::kDefaultSearchProviderEnabled] =
167 settings_private::PrefType::PREF_TYPE_BOOLEAN; 167 settings_private::PrefType::PREF_TYPE_BOOLEAN;
168 (*s_whitelist)[::prefs::kGoogleNowLauncherEnabled] = 168 (*s_whitelist)[::prefs::kGoogleNowLauncherEnabled] =
169 settings_private::PrefType::PREF_TYPE_BOOLEAN; 169 settings_private::PrefType::PREF_TYPE_BOOLEAN;
170 170
171 // Site Settings prefs. 171 // Site Settings prefs.
172 (*s_whitelist)[::prefs::kBlockThirdPartyCookies] = 172 (*s_whitelist)[::prefs::kBlockThirdPartyCookies] =
173 settings_private::PrefType::PREF_TYPE_BOOLEAN; 173 settings_private::PrefType::PREF_TYPE_BOOLEAN;
174 (*s_whitelist)[::prefs::kPluginsAlwaysOpenPdfExternally] = 174 (*s_whitelist)[::prefs::kPluginsAlwaysOpenPdfExternally] =
175 settings_private::PrefType::PREF_TYPE_BOOLEAN; 175 settings_private::PrefType::PREF_TYPE_BOOLEAN;
176 (*s_whitelist)[::prefs::kEnableDRM] =
177 settings_private::PrefType::PREF_TYPE_BOOLEAN;
176 178
177 // Clear browsing data settings. 179 // Clear browsing data settings.
178 (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistory] = 180 (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistory] =
179 settings_private::PrefType::PREF_TYPE_BOOLEAN; 181 settings_private::PrefType::PREF_TYPE_BOOLEAN;
180 (*s_whitelist)[browsing_data::prefs::kDeleteDownloadHistory] = 182 (*s_whitelist)[browsing_data::prefs::kDeleteDownloadHistory] =
181 settings_private::PrefType::PREF_TYPE_BOOLEAN; 183 settings_private::PrefType::PREF_TYPE_BOOLEAN;
182 (*s_whitelist)[browsing_data::prefs::kDeleteCache] = 184 (*s_whitelist)[browsing_data::prefs::kDeleteCache] =
183 settings_private::PrefType::PREF_TYPE_BOOLEAN; 185 settings_private::PrefType::PREF_TYPE_BOOLEAN;
184 (*s_whitelist)[browsing_data::prefs::kDeleteCookies] = 186 (*s_whitelist)[browsing_data::prefs::kDeleteCookies] =
185 settings_private::PrefType::PREF_TYPE_BOOLEAN; 187 settings_private::PrefType::PREF_TYPE_BOOLEAN;
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled) 731 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)
730 return GetExtensionOverridingSearchEngine(profile_); 732 return GetExtensionOverridingSearchEngine(profile_);
731 733
732 if (pref_object.key == proxy_config::prefs::kProxy) 734 if (pref_object.key == proxy_config::prefs::kProxy)
733 return GetExtensionOverridingProxy(profile_); 735 return GetExtensionOverridingProxy(profile_);
734 736
735 return nullptr; 737 return nullptr;
736 } 738 }
737 739
738 } // namespace extensions 740 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698