| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/browser_prefs.h" |
| 6 | 6 |
| 7 #include "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #include "chrome/browser/profiles/chrome_version_service.h" | 61 #include "chrome/browser/profiles/chrome_version_service.h" |
| 62 #include "chrome/browser/profiles/profile.h" | 62 #include "chrome/browser/profiles/profile.h" |
| 63 #include "chrome/browser/profiles/profile_impl.h" | 63 #include "chrome/browser/profiles/profile_impl.h" |
| 64 #include "chrome/browser/profiles/profile_info_cache.h" | 64 #include "chrome/browser/profiles/profile_info_cache.h" |
| 65 #include "chrome/browser/profiles/profiles_state.h" | 65 #include "chrome/browser/profiles/profiles_state.h" |
| 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 67 #include "chrome/browser/renderer_host/web_cache_manager.h" | 67 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 68 #include "chrome/browser/search/search.h" | 68 #include "chrome/browser/search/search.h" |
| 69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 70 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 70 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
| 71 #include "chrome/browser/signin/easy_unlock_controller.h" | 71 #include "chrome/browser/signin/easy_unlock.h" |
| 72 #include "chrome/browser/signin/signin_manager_factory.h" | 72 #include "chrome/browser/signin/signin_manager_factory.h" |
| 73 #include "chrome/browser/signin/signin_promo.h" | 73 #include "chrome/browser/signin/signin_promo.h" |
| 74 #include "chrome/browser/task_manager/task_manager.h" | 74 #include "chrome/browser/task_manager/task_manager.h" |
| 75 #include "chrome/browser/ui/app_list/app_list_service.h" | 75 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 76 #include "chrome/browser/ui/browser_ui_prefs.h" | 76 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 77 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 77 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| 78 #include "chrome/browser/ui/network_profile_bubble.h" | 78 #include "chrome/browser/ui/network_profile_bubble.h" |
| 79 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 79 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 80 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 80 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 81 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 81 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 BookmarkPromptPrefs::RegisterProfilePrefs(registry); | 341 BookmarkPromptPrefs::RegisterProfilePrefs(registry); |
| 342 bookmark_utils::RegisterProfilePrefs(registry); | 342 bookmark_utils::RegisterProfilePrefs(registry); |
| 343 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 343 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
| 344 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 344 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
| 345 ChromeVersionService::RegisterProfilePrefs(registry); | 345 ChromeVersionService::RegisterProfilePrefs(registry); |
| 346 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( | 346 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( |
| 347 registry); | 347 registry); |
| 348 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 348 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
| 349 chrome_prefs::RegisterProfilePrefs(registry); | 349 chrome_prefs::RegisterProfilePrefs(registry); |
| 350 DownloadPrefs::RegisterProfilePrefs(registry); | 350 DownloadPrefs::RegisterProfilePrefs(registry); |
| 351 EasyUnlockController::RegisterProfilePrefs(registry); | 351 easy_unlock::RegisterProfilePrefs(registry); |
| 352 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 352 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
| 353 extensions::launch_util::RegisterProfilePrefs(registry); | 353 extensions::launch_util::RegisterProfilePrefs(registry); |
| 354 ExtensionWebUI::RegisterProfilePrefs(registry); | 354 ExtensionWebUI::RegisterProfilePrefs(registry); |
| 355 HostContentSettingsMap::RegisterProfilePrefs(registry); | 355 HostContentSettingsMap::RegisterProfilePrefs(registry); |
| 356 IncognitoModePrefs::RegisterProfilePrefs(registry); | 356 IncognitoModePrefs::RegisterProfilePrefs(registry); |
| 357 InstantUI::RegisterProfilePrefs(registry); | 357 InstantUI::RegisterProfilePrefs(registry); |
| 358 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 358 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
| 359 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 359 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
| 360 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 360 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
| 361 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 361 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 581 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 582 current_version); | 582 current_version); |
| 583 } | 583 } |
| 584 | 584 |
| 585 #if defined(OS_CHROMEOS) | 585 #if defined(OS_CHROMEOS) |
| 586 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 586 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
| 587 #endif | 587 #endif |
| 588 } | 588 } |
| 589 | 589 |
| 590 } // namespace chrome | 590 } // namespace chrome |
| OLD | NEW |