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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/printing/print_dialog_cloud.h" | 54 #include "chrome/browser/printing/print_dialog_cloud.h" |
55 #include "chrome/browser/profiles/chrome_version_service.h" | 55 #include "chrome/browser/profiles/chrome_version_service.h" |
56 #include "chrome/browser/profiles/profile.h" | 56 #include "chrome/browser/profiles/profile.h" |
57 #include "chrome/browser/profiles/profile_impl.h" | 57 #include "chrome/browser/profiles/profile_impl.h" |
58 #include "chrome/browser/profiles/profile_info_cache.h" | 58 #include "chrome/browser/profiles/profile_info_cache.h" |
59 #include "chrome/browser/profiles/profiles_state.h" | 59 #include "chrome/browser/profiles/profiles_state.h" |
60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
61 #include "chrome/browser/renderer_host/web_cache_manager.h" | 61 #include "chrome/browser/renderer_host/web_cache_manager.h" |
62 #include "chrome/browser/search/search.h" | 62 #include "chrome/browser/search/search.h" |
63 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 63 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
64 #include "chrome/browser/signin/easy_unlock_service.h" | |
65 #include "chrome/browser/signin/signin_manager_factory.h" | 64 #include "chrome/browser/signin/signin_manager_factory.h" |
66 #include "chrome/browser/signin/signin_promo.h" | 65 #include "chrome/browser/signin/signin_promo.h" |
67 #include "chrome/browser/task_manager/task_manager.h" | 66 #include "chrome/browser/task_manager/task_manager.h" |
68 #include "chrome/browser/ui/app_list/app_list_service.h" | 67 #include "chrome/browser/ui/app_list/app_list_service.h" |
69 #include "chrome/browser/ui/browser_ui_prefs.h" | 68 #include "chrome/browser/ui/browser_ui_prefs.h" |
70 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 69 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
71 #include "chrome/browser/ui/network_profile_bubble.h" | 70 #include "chrome/browser/ui/network_profile_bubble.h" |
72 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 71 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
73 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 72 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
74 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 73 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 #include "components/policy/core/browser/url_blacklist_manager.h" | 107 #include "components/policy/core/browser/url_blacklist_manager.h" |
109 #include "components/policy/core/common/policy_statistics_collector.h" | 108 #include "components/policy/core/common/policy_statistics_collector.h" |
110 #endif | 109 #endif |
111 | 110 |
112 #if defined(ENABLE_EXTENSIONS) | 111 #if defined(ENABLE_EXTENSIONS) |
113 #include "apps/prefs.h" | 112 #include "apps/prefs.h" |
114 #include "chrome/browser/extensions/activity_log/activity_log.h" | 113 #include "chrome/browser/extensions/activity_log/activity_log.h" |
115 #include "chrome/browser/extensions/api/commands/command_service.h" | 114 #include "chrome/browser/extensions/api/commands/command_service.h" |
116 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 115 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
117 #include "chrome/browser/extensions/launch_util.h" | 116 #include "chrome/browser/extensions/launch_util.h" |
| 117 #include "chrome/browser/signin/easy_unlock_service.h" |
118 #endif | 118 #endif |
119 | 119 |
120 #if defined(ENABLE_MANAGED_USERS) | 120 #if defined(ENABLE_MANAGED_USERS) |
121 #include "chrome/browser/supervised_user/supervised_user_service.h" | 121 #include "chrome/browser/supervised_user/supervised_user_service.h" |
122 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" | 122 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service
.h" |
123 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" | 123 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" |
124 #endif | 124 #endif |
125 | 125 |
126 #if defined(ENABLE_SERVICE_DISCOVERY) | 126 #if defined(ENABLE_SERVICE_DISCOVERY) |
127 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 127 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); | 354 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); |
355 ChromeContentBrowserClient::RegisterProfilePrefs(registry); | 355 ChromeContentBrowserClient::RegisterProfilePrefs(registry); |
356 ChromeVersionService::RegisterProfilePrefs(registry); | 356 ChromeVersionService::RegisterProfilePrefs(registry); |
357 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( | 357 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( |
358 registry); | 358 registry); |
359 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); | 359 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); |
360 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); | 360 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); |
361 chrome_prefs::RegisterProfilePrefs(registry); | 361 chrome_prefs::RegisterProfilePrefs(registry); |
362 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); | 362 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); |
363 DownloadPrefs::RegisterProfilePrefs(registry); | 363 DownloadPrefs::RegisterProfilePrefs(registry); |
364 EasyUnlockService::RegisterProfilePrefs(registry); | |
365 gcm::GCMProfileService::RegisterProfilePrefs(registry); | 364 gcm::GCMProfileService::RegisterProfilePrefs(registry); |
366 HostContentSettingsMap::RegisterProfilePrefs(registry); | 365 HostContentSettingsMap::RegisterProfilePrefs(registry); |
367 IncognitoModePrefs::RegisterProfilePrefs(registry); | 366 IncognitoModePrefs::RegisterProfilePrefs(registry); |
368 InstantUI::RegisterProfilePrefs(registry); | 367 InstantUI::RegisterProfilePrefs(registry); |
369 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); | 368 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); |
370 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); | 369 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); |
371 MediaDeviceIDSalt::RegisterProfilePrefs(registry); | 370 MediaDeviceIDSalt::RegisterProfilePrefs(registry); |
372 MediaStreamDevicesController::RegisterProfilePrefs(registry); | 371 MediaStreamDevicesController::RegisterProfilePrefs(registry); |
373 NetPrefObserver::RegisterProfilePrefs(registry); | 372 NetPrefObserver::RegisterProfilePrefs(registry); |
374 password_manager::PasswordManager::RegisterProfilePrefs(registry); | 373 password_manager::PasswordManager::RegisterProfilePrefs(registry); |
(...skipping 12 matching lines...) Expand all Loading... |
387 #if defined(ENABLE_AUTOFILL_DIALOG) | 386 #if defined(ENABLE_AUTOFILL_DIALOG) |
388 autofill::AutofillDialogController::RegisterProfilePrefs(registry); | 387 autofill::AutofillDialogController::RegisterProfilePrefs(registry); |
389 #endif | 388 #endif |
390 | 389 |
391 #if defined(ENABLE_CONFIGURATION_POLICY) | 390 #if defined(ENABLE_CONFIGURATION_POLICY) |
392 policy::URLBlacklistManager::RegisterProfilePrefs(registry); | 391 policy::URLBlacklistManager::RegisterProfilePrefs(registry); |
393 #endif | 392 #endif |
394 | 393 |
395 #if defined(ENABLE_EXTENSIONS) | 394 #if defined(ENABLE_EXTENSIONS) |
396 apps::RegisterProfilePrefs(registry); | 395 apps::RegisterProfilePrefs(registry); |
| 396 EasyUnlockService::RegisterProfilePrefs(registry); |
397 extensions::ActivityLog::RegisterProfilePrefs(registry); | 397 extensions::ActivityLog::RegisterProfilePrefs(registry); |
398 extensions::launch_util::RegisterProfilePrefs(registry); | 398 extensions::launch_util::RegisterProfilePrefs(registry); |
399 #endif | 399 #endif |
400 // TODO(thestig) These should be in ifdef'd out, but too many parts of Chrome | 400 // TODO(thestig) These should be in ifdef'd out, but too many parts of Chrome |
401 // still expects it to be registered. | 401 // still expects it to be registered. |
402 ExtensionWebUI::RegisterProfilePrefs(registry); | 402 ExtensionWebUI::RegisterProfilePrefs(registry); |
403 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); | 403 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); |
404 | 404 |
405 #if defined(ENABLE_FULL_PRINTING) | 405 #if defined(ENABLE_FULL_PRINTING) |
406 print_dialog_cloud::RegisterProfilePrefs(registry); | 406 print_dialog_cloud::RegisterProfilePrefs(registry); |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 #if defined(OS_CHROMEOS) | 593 #if defined(OS_CHROMEOS) |
594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
595 #endif | 595 #endif |
596 | 596 |
597 #if defined(TOOLKIT_VIEWS) | 597 #if defined(TOOLKIT_VIEWS) |
598 MigrateBrowserTabStripPrefs(local_state); | 598 MigrateBrowserTabStripPrefs(local_state); |
599 #endif | 599 #endif |
600 } | 600 } |
601 | 601 |
602 } // namespace chrome | 602 } // namespace chrome |
OLD | NEW |