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

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

Issue 2572963004: MD Settings: Add "Show Google Now cards in the launcher" row in Search section. (Closed)
Patch Set: Rebase Created 4 years 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 (*s_whitelist)[spellcheck::prefs::kSpellCheckUseSpellingService] = 158 (*s_whitelist)[spellcheck::prefs::kSpellCheckUseSpellingService] =
159 settings_private::PrefType::PREF_TYPE_BOOLEAN; 159 settings_private::PrefType::PREF_TYPE_BOOLEAN;
160 (*s_whitelist)[::prefs::kEnableTranslate] = 160 (*s_whitelist)[::prefs::kEnableTranslate] =
161 settings_private::PrefType::PREF_TYPE_BOOLEAN; 161 settings_private::PrefType::PREF_TYPE_BOOLEAN;
162 (*s_whitelist)[translate::TranslatePrefs::kPrefTranslateBlockedLanguages] = 162 (*s_whitelist)[translate::TranslatePrefs::kPrefTranslateBlockedLanguages] =
163 settings_private::PrefType::PREF_TYPE_LIST; 163 settings_private::PrefType::PREF_TYPE_LIST;
164 164
165 // Search page. 165 // Search page.
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] =
169 settings_private::PrefType::PREF_TYPE_BOOLEAN;
168 170
169 // Site Settings prefs. 171 // Site Settings prefs.
170 (*s_whitelist)[::prefs::kBlockThirdPartyCookies] = 172 (*s_whitelist)[::prefs::kBlockThirdPartyCookies] =
171 settings_private::PrefType::PREF_TYPE_BOOLEAN; 173 settings_private::PrefType::PREF_TYPE_BOOLEAN;
172 (*s_whitelist)[::prefs::kPluginsAlwaysOpenPdfExternally] = 174 (*s_whitelist)[::prefs::kPluginsAlwaysOpenPdfExternally] =
173 settings_private::PrefType::PREF_TYPE_BOOLEAN; 175 settings_private::PrefType::PREF_TYPE_BOOLEAN;
174 176
175 // Clear browsing data settings. 177 // Clear browsing data settings.
176 (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistory] = 178 (*s_whitelist)[browsing_data::prefs::kDeleteBrowsingHistory] =
177 settings_private::PrefType::PREF_TYPE_BOOLEAN; 179 settings_private::PrefType::PREF_TYPE_BOOLEAN;
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled) 727 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)
726 return GetExtensionOverridingSearchEngine(profile_); 728 return GetExtensionOverridingSearchEngine(profile_);
727 729
728 if (pref_object.key == proxy_config::prefs::kProxy) 730 if (pref_object.key == proxy_config::prefs::kProxy)
729 return GetExtensionOverridingProxy(profile_); 731 return GetExtensionOverridingProxy(profile_);
730 732
731 return nullptr; 733 return nullptr;
732 } 734 }
733 735
734 } // namespace extensions 736 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/basic_page/basic_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698