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

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

Issue 2500653002: MD Settings: Add import data dialog. (Closed)
Patch Set: Fix bad merge 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 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 settings_private::PrefType::PREF_TYPE_NUMBER; 291 settings_private::PrefType::PREF_TYPE_NUMBER;
292 #else 292 #else
293 (*s_whitelist)[::prefs::kAcceptLanguages] = 293 (*s_whitelist)[::prefs::kAcceptLanguages] =
294 settings_private::PrefType::PREF_TYPE_STRING; 294 settings_private::PrefType::PREF_TYPE_STRING;
295 295
296 // System settings. 296 // System settings.
297 (*s_whitelist)[::prefs::kBackgroundModeEnabled] = 297 (*s_whitelist)[::prefs::kBackgroundModeEnabled] =
298 settings_private::PrefType::PREF_TYPE_BOOLEAN; 298 settings_private::PrefType::PREF_TYPE_BOOLEAN;
299 (*s_whitelist)[::prefs::kHardwareAccelerationModeEnabled] = 299 (*s_whitelist)[::prefs::kHardwareAccelerationModeEnabled] =
300 settings_private::PrefType::PREF_TYPE_BOOLEAN; 300 settings_private::PrefType::PREF_TYPE_BOOLEAN;
301
302 // Import data
303 (*s_whitelist)[::prefs::kImportAutofillFormData] =
304 settings_private::PrefType::PREF_TYPE_BOOLEAN;
305 (*s_whitelist)[::prefs::kImportBookmarks] =
306 settings_private::PrefType::PREF_TYPE_BOOLEAN;
307 (*s_whitelist)[::prefs::kImportHistory] =
308 settings_private::PrefType::PREF_TYPE_BOOLEAN;
309 (*s_whitelist)[::prefs::kImportHomepage] =
310 settings_private::PrefType::PREF_TYPE_BOOLEAN;
311 (*s_whitelist)[::prefs::kImportSavedPasswords] =
312 settings_private::PrefType::PREF_TYPE_BOOLEAN;
313 (*s_whitelist)[::prefs::kImportSearchEngine] =
314 settings_private::PrefType::PREF_TYPE_BOOLEAN;
301 #endif 315 #endif
302 316
303 // Proxy settings. 317 // Proxy settings.
304 (*s_whitelist)[proxy_config::prefs::kProxy] = 318 (*s_whitelist)[proxy_config::prefs::kProxy] =
305 settings_private::PrefType::PREF_TYPE_DICTIONARY; 319 settings_private::PrefType::PREF_TYPE_DICTIONARY;
306 320
307 #if defined(GOOGLE_CHROME_BUILD) 321 #if defined(GOOGLE_CHROME_BUILD)
308 (*s_whitelist)[::prefs::kMediaRouterEnableCloudServices] = 322 (*s_whitelist)[::prefs::kMediaRouterEnableCloudServices] =
309 settings_private::PrefType::PREF_TYPE_BOOLEAN; 323 settings_private::PrefType::PREF_TYPE_BOOLEAN;
310 #endif // defined(GOOGLE_CHROME_BUILD) 324 #endif // defined(GOOGLE_CHROME_BUILD)
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 673
660 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) { 674 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) {
661 #if defined(OS_CHROMEOS) 675 #if defined(OS_CHROMEOS)
662 return CrosSettings::Get()->IsCrosSettings(pref_name); 676 return CrosSettings::Get()->IsCrosSettings(pref_name);
663 #else 677 #else
664 return false; 678 return false;
665 #endif 679 #endif
666 } 680 }
667 681
668 } // namespace extensions 682 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/compiled_resources2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698