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 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/extensions/extension_prefs.h" | 26 #include "chrome/browser/extensions/extension_prefs.h" |
27 #include "chrome/browser/extensions/extension_web_ui.h" | 27 #include "chrome/browser/extensions/extension_web_ui.h" |
28 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 28 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
29 #include "chrome/browser/first_run/first_run.h" | 29 #include "chrome/browser/first_run/first_run.h" |
30 #include "chrome/browser/geolocation/geolocation_prefs.h" | 30 #include "chrome/browser/geolocation/geolocation_prefs.h" |
31 #include "chrome/browser/google/google_url_tracker.h" | 31 #include "chrome/browser/google/google_url_tracker.h" |
32 #include "chrome/browser/google/google_url_tracker_factory.h" | 32 #include "chrome/browser/google/google_url_tracker_factory.h" |
33 #include "chrome/browser/gpu/gl_string_manager.h" | 33 #include "chrome/browser/gpu/gl_string_manager.h" |
34 #include "chrome/browser/gpu/gpu_mode_manager.h" | 34 #include "chrome/browser/gpu/gpu_mode_manager.h" |
35 #include "chrome/browser/intranet_redirect_detector.h" | 35 #include "chrome/browser/intranet_redirect_detector.h" |
36 #include "chrome/browser/invalidation/invalidator_storage.h" | |
37 #include "chrome/browser/io_thread.h" | 36 #include "chrome/browser/io_thread.h" |
38 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 37 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
39 #include "chrome/browser/media/media_stream_devices_controller.h" | 38 #include "chrome/browser/media/media_stream_devices_controller.h" |
40 #include "chrome/browser/metrics/metrics_log.h" | 39 #include "chrome/browser/metrics/metrics_log.h" |
41 #include "chrome/browser/metrics/metrics_service.h" | 40 #include "chrome/browser/metrics/metrics_service.h" |
42 #include "chrome/browser/metrics/variations/variations_service.h" | 41 #include "chrome/browser/metrics/variations/variations_service.h" |
43 #include "chrome/browser/net/http_server_properties_manager.h" | 42 #include "chrome/browser/net/http_server_properties_manager.h" |
44 #include "chrome/browser/net/net_pref_observer.h" | 43 #include "chrome/browser/net/net_pref_observer.h" |
45 #include "chrome/browser/net/predictor.h" | 44 #include "chrome/browser/net/predictor.h" |
46 #include "chrome/browser/net/ssl_config_service_manager.h" | 45 #include "chrome/browser/net/ssl_config_service_manager.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( | 294 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( |
296 registry); | 295 registry); |
297 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 296 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
298 DownloadPrefs::RegisterUserPrefs(registry); | 297 DownloadPrefs::RegisterUserPrefs(registry); |
299 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 298 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
300 ExtensionWebUI::RegisterUserPrefs(registry); | 299 ExtensionWebUI::RegisterUserPrefs(registry); |
301 first_run::RegisterUserPrefs(registry); | 300 first_run::RegisterUserPrefs(registry); |
302 HostContentSettingsMap::RegisterUserPrefs(registry); | 301 HostContentSettingsMap::RegisterUserPrefs(registry); |
303 IncognitoModePrefs::RegisterUserPrefs(registry); | 302 IncognitoModePrefs::RegisterUserPrefs(registry); |
304 InstantUI::RegisterUserPrefs(registry); | 303 InstantUI::RegisterUserPrefs(registry); |
305 invalidation::InvalidatorStorage::RegisterUserPrefs(registry); | |
306 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); | 304 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); |
307 MediaStreamDevicesController::RegisterUserPrefs(registry); | 305 MediaStreamDevicesController::RegisterUserPrefs(registry); |
308 NetPrefObserver::RegisterUserPrefs(registry); | 306 NetPrefObserver::RegisterUserPrefs(registry); |
309 NewTabUI::RegisterUserPrefs(registry); | 307 NewTabUI::RegisterUserPrefs(registry); |
310 PasswordGenerationManager::RegisterUserPrefs(registry); | 308 PasswordGenerationManager::RegisterUserPrefs(registry); |
311 PasswordManager::RegisterUserPrefs(registry); | 309 PasswordManager::RegisterUserPrefs(registry); |
312 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); | 310 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); |
313 PrefsTabHelper::RegisterUserPrefs(registry); | 311 PrefsTabHelper::RegisterUserPrefs(registry); |
314 Profile::RegisterUserPrefs(registry); | 312 Profile::RegisterUserPrefs(registry); |
315 ProfileImpl::RegisterUserPrefs(registry); | 313 ProfileImpl::RegisterUserPrefs(registry); |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 } | 463 } |
466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 464 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
467 | 465 |
468 current_version |= GOOGLE_URL_TRACKER_PREFS; | 466 current_version |= GOOGLE_URL_TRACKER_PREFS; |
469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 467 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
470 current_version); | 468 current_version); |
471 } | 469 } |
472 } | 470 } |
473 | 471 |
474 } // namespace chrome | 472 } // namespace chrome |
OLD | NEW |