| 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/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/browser/extensions/extension_prefs.h" | 27 #include "chrome/browser/extensions/extension_prefs.h" |
| 28 #include "chrome/browser/extensions/extension_web_ui.h" | 28 #include "chrome/browser/extensions/extension_web_ui.h" |
| 29 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 29 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 30 #include "chrome/browser/first_run/first_run.h" | 30 #include "chrome/browser/first_run/first_run.h" |
| 31 #include "chrome/browser/geolocation/geolocation_prefs.h" | 31 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 32 #include "chrome/browser/google/google_url_tracker.h" | 32 #include "chrome/browser/google/google_url_tracker.h" |
| 33 #include "chrome/browser/google/google_url_tracker_factory.h" | 33 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 34 #include "chrome/browser/gpu/gl_string_manager.h" | 34 #include "chrome/browser/gpu/gl_string_manager.h" |
| 35 #include "chrome/browser/gpu/gpu_mode_manager.h" | 35 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 36 #include "chrome/browser/intranet_redirect_detector.h" | 36 #include "chrome/browser/intranet_redirect_detector.h" |
| 37 #include "chrome/browser/invalidation/invalidator_storage.h" |
| 37 #include "chrome/browser/io_thread.h" | 38 #include "chrome/browser/io_thread.h" |
| 38 #include "chrome/browser/managed_mode/managed_mode.h" | 39 #include "chrome/browser/managed_mode/managed_mode.h" |
| 39 #include "chrome/browser/managed_mode/managed_user_service.h" | 40 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 40 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 41 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 41 #include "chrome/browser/media/media_stream_devices_controller.h" | 42 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 42 #include "chrome/browser/metrics/metrics_log.h" | 43 #include "chrome/browser/metrics/metrics_log.h" |
| 43 #include "chrome/browser/metrics/metrics_service.h" | 44 #include "chrome/browser/metrics/metrics_service.h" |
| 44 #include "chrome/browser/metrics/variations/variations_service.h" | 45 #include "chrome/browser/metrics/variations/variations_service.h" |
| 45 #include "chrome/browser/net/http_server_properties_manager.h" | 46 #include "chrome/browser/net/http_server_properties_manager.h" |
| 46 #include "chrome/browser/net/net_pref_observer.h" | 47 #include "chrome/browser/net/net_pref_observer.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 60 #include "chrome/browser/profiles/chrome_version_service.h" | 61 #include "chrome/browser/profiles/chrome_version_service.h" |
| 61 #include "chrome/browser/profiles/profile.h" | 62 #include "chrome/browser/profiles/profile.h" |
| 62 #include "chrome/browser/profiles/profile_impl.h" | 63 #include "chrome/browser/profiles/profile_impl.h" |
| 63 #include "chrome/browser/profiles/profile_info_cache.h" | 64 #include "chrome/browser/profiles/profile_info_cache.h" |
| 64 #include "chrome/browser/profiles/profile_manager.h" | 65 #include "chrome/browser/profiles/profile_manager.h" |
| 65 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 66 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 66 #include "chrome/browser/renderer_host/web_cache_manager.h" | 67 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 67 #include "chrome/browser/search/search.h" | 68 #include "chrome/browser/search/search.h" |
| 68 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 69 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 69 #include "chrome/browser/signin/signin_manager_factory.h" | 70 #include "chrome/browser/signin/signin_manager_factory.h" |
| 70 #include "chrome/browser/sync/invalidations/invalidator_storage.h" | |
| 71 #include "chrome/browser/sync/sync_prefs.h" | 71 #include "chrome/browser/sync/sync_prefs.h" |
| 72 #include "chrome/browser/task_manager/task_manager.h" | 72 #include "chrome/browser/task_manager/task_manager.h" |
| 73 #include "chrome/browser/translate/translate_prefs.h" | 73 #include "chrome/browser/translate/translate_prefs.h" |
| 74 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 74 #include "chrome/browser/ui/alternate_error_tab_observer.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/autofill/autofill_dialog_controller_impl.h" | 76 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" |
| 77 #include "chrome/browser/ui/browser_ui_prefs.h" | 77 #include "chrome/browser/ui/browser_ui_prefs.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" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 registry); | 283 registry); |
| 284 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 284 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
| 285 DownloadPrefs::RegisterUserPrefs(registry); | 285 DownloadPrefs::RegisterUserPrefs(registry); |
| 286 extensions::ComponentLoader::RegisterUserPrefs(registry); | 286 extensions::ComponentLoader::RegisterUserPrefs(registry); |
| 287 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 287 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
| 288 ExtensionWebUI::RegisterUserPrefs(registry); | 288 ExtensionWebUI::RegisterUserPrefs(registry); |
| 289 first_run::RegisterUserPrefs(registry); | 289 first_run::RegisterUserPrefs(registry); |
| 290 HostContentSettingsMap::RegisterUserPrefs(registry); | 290 HostContentSettingsMap::RegisterUserPrefs(registry); |
| 291 IncognitoModePrefs::RegisterUserPrefs(registry); | 291 IncognitoModePrefs::RegisterUserPrefs(registry); |
| 292 InstantUI::RegisterUserPrefs(registry); | 292 InstantUI::RegisterUserPrefs(registry); |
| 293 browser_sync::InvalidatorStorage::RegisterUserPrefs(registry); | 293 invalidation::InvalidatorStorage::RegisterUserPrefs(registry); |
| 294 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); | 294 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); |
| 295 MediaStreamDevicesController::RegisterUserPrefs(registry); | 295 MediaStreamDevicesController::RegisterUserPrefs(registry); |
| 296 NetPrefObserver::RegisterUserPrefs(registry); | 296 NetPrefObserver::RegisterUserPrefs(registry); |
| 297 NewTabUI::RegisterUserPrefs(registry); | 297 NewTabUI::RegisterUserPrefs(registry); |
| 298 PasswordGenerationManager::RegisterUserPrefs(registry); | 298 PasswordGenerationManager::RegisterUserPrefs(registry); |
| 299 PasswordManager::RegisterUserPrefs(registry); | 299 PasswordManager::RegisterUserPrefs(registry); |
| 300 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); | 300 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); |
| 301 PrefsTabHelper::RegisterUserPrefs(registry); | 301 PrefsTabHelper::RegisterUserPrefs(registry); |
| 302 Profile::RegisterUserPrefs(registry); | 302 Profile::RegisterUserPrefs(registry); |
| 303 ProfileImpl::RegisterUserPrefs(registry); | 303 ProfileImpl::RegisterUserPrefs(registry); |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 } | 450 } |
| 451 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 451 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 452 | 452 |
| 453 current_version |= GOOGLE_URL_TRACKER_PREFS; | 453 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 454 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 454 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 455 current_version); | 455 current_version); |
| 456 } | 456 } |
| 457 } | 457 } |
| 458 | 458 |
| 459 } // namespace chrome | 459 } // namespace chrome |
| OLD | NEW |