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

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

Issue 2507253003: MD Settings: Add ImportDataDialog tests. (Closed)
Patch Set: Nit. 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/import_data_dialog.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 (*s_whitelist)[::prefs::kHardwareAccelerationModeEnabled] = 307 (*s_whitelist)[::prefs::kHardwareAccelerationModeEnabled] =
308 settings_private::PrefType::PREF_TYPE_BOOLEAN; 308 settings_private::PrefType::PREF_TYPE_BOOLEAN;
309 309
310 // Import data 310 // Import data
311 (*s_whitelist)[::prefs::kImportAutofillFormData] = 311 (*s_whitelist)[::prefs::kImportAutofillFormData] =
312 settings_private::PrefType::PREF_TYPE_BOOLEAN; 312 settings_private::PrefType::PREF_TYPE_BOOLEAN;
313 (*s_whitelist)[::prefs::kImportBookmarks] = 313 (*s_whitelist)[::prefs::kImportBookmarks] =
314 settings_private::PrefType::PREF_TYPE_BOOLEAN; 314 settings_private::PrefType::PREF_TYPE_BOOLEAN;
315 (*s_whitelist)[::prefs::kImportHistory] = 315 (*s_whitelist)[::prefs::kImportHistory] =
316 settings_private::PrefType::PREF_TYPE_BOOLEAN; 316 settings_private::PrefType::PREF_TYPE_BOOLEAN;
317 (*s_whitelist)[::prefs::kImportHomepage] =
318 settings_private::PrefType::PREF_TYPE_BOOLEAN;
319 (*s_whitelist)[::prefs::kImportSavedPasswords] = 317 (*s_whitelist)[::prefs::kImportSavedPasswords] =
320 settings_private::PrefType::PREF_TYPE_BOOLEAN; 318 settings_private::PrefType::PREF_TYPE_BOOLEAN;
321 (*s_whitelist)[::prefs::kImportSearchEngine] = 319 (*s_whitelist)[::prefs::kImportSearchEngine] =
322 settings_private::PrefType::PREF_TYPE_BOOLEAN; 320 settings_private::PrefType::PREF_TYPE_BOOLEAN;
323 #endif 321 #endif
324 322
325 // Proxy settings. 323 // Proxy settings.
326 (*s_whitelist)[proxy_config::prefs::kProxy] = 324 (*s_whitelist)[proxy_config::prefs::kProxy] =
327 settings_private::PrefType::PREF_TYPE_DICTIONARY; 325 settings_private::PrefType::PREF_TYPE_DICTIONARY;
328 326
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 if (pref_object.key == ::prefs::kURLsToRestoreOnStartup) 690 if (pref_object.key == ::prefs::kURLsToRestoreOnStartup)
693 return GetExtensionOverridingStartupPages(profile_); 691 return GetExtensionOverridingStartupPages(profile_);
694 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled) 692 if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)
695 return GetExtensionOverridingSearchEngine(profile_); 693 return GetExtensionOverridingSearchEngine(profile_);
696 if (pref_object.key == proxy_config::prefs::kProxy) 694 if (pref_object.key == proxy_config::prefs::kProxy)
697 return GetExtensionOverridingProxy(profile_); 695 return GetExtensionOverridingProxy(profile_);
698 return nullptr; 696 return nullptr;
699 } 697 }
700 698
701 } // namespace extensions 699 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/import_data_dialog.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698