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" | |
38 #include "chrome/browser/io_thread.h" | 37 #include "chrome/browser/io_thread.h" |
39 #include "chrome/browser/managed_mode/managed_mode.h" | 38 #include "chrome/browser/managed_mode/managed_mode.h" |
40 #include "chrome/browser/managed_mode/managed_user_service.h" | 39 #include "chrome/browser/managed_mode/managed_user_service.h" |
41 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 40 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
42 #include "chrome/browser/media/media_stream_devices_controller.h" | 41 #include "chrome/browser/media/media_stream_devices_controller.h" |
43 #include "chrome/browser/metrics/metrics_log.h" | 42 #include "chrome/browser/metrics/metrics_log.h" |
44 #include "chrome/browser/metrics/metrics_service.h" | 43 #include "chrome/browser/metrics/metrics_service.h" |
45 #include "chrome/browser/metrics/variations/variations_service.h" | 44 #include "chrome/browser/metrics/variations/variations_service.h" |
46 #include "chrome/browser/net/http_server_properties_manager.h" | 45 #include "chrome/browser/net/http_server_properties_manager.h" |
47 #include "chrome/browser/net/net_pref_observer.h" | 46 #include "chrome/browser/net/net_pref_observer.h" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
288 registry); | 287 registry); |
289 chrome_browser_net::Predictor::RegisterUserPrefs(registry); | 288 chrome_browser_net::Predictor::RegisterUserPrefs(registry); |
290 DownloadPrefs::RegisterUserPrefs(registry); | 289 DownloadPrefs::RegisterUserPrefs(registry); |
291 extensions::ComponentLoader::RegisterUserPrefs(registry); | 290 extensions::ComponentLoader::RegisterUserPrefs(registry); |
292 extensions::ExtensionPrefs::RegisterUserPrefs(registry); | 291 extensions::ExtensionPrefs::RegisterUserPrefs(registry); |
293 ExtensionWebUI::RegisterUserPrefs(registry); | 292 ExtensionWebUI::RegisterUserPrefs(registry); |
294 first_run::RegisterUserPrefs(registry); | 293 first_run::RegisterUserPrefs(registry); |
295 HostContentSettingsMap::RegisterUserPrefs(registry); | 294 HostContentSettingsMap::RegisterUserPrefs(registry); |
296 IncognitoModePrefs::RegisterUserPrefs(registry); | 295 IncognitoModePrefs::RegisterUserPrefs(registry); |
297 InstantUI::RegisterUserPrefs(registry); | 296 InstantUI::RegisterUserPrefs(registry); |
298 invalidation::InvalidatorStorage::RegisterUserPrefs(registry); | |
rlarocque
2013/05/21 20:51:36
In case you're wondering, this call was moved to t
| |
299 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); | 297 MediaCaptureDevicesDispatcher::RegisterUserPrefs(registry); |
300 MediaStreamDevicesController::RegisterUserPrefs(registry); | 298 MediaStreamDevicesController::RegisterUserPrefs(registry); |
301 NetPrefObserver::RegisterUserPrefs(registry); | 299 NetPrefObserver::RegisterUserPrefs(registry); |
302 NewTabUI::RegisterUserPrefs(registry); | 300 NewTabUI::RegisterUserPrefs(registry); |
303 PasswordGenerationManager::RegisterUserPrefs(registry); | 301 PasswordGenerationManager::RegisterUserPrefs(registry); |
304 PasswordManager::RegisterUserPrefs(registry); | 302 PasswordManager::RegisterUserPrefs(registry); |
305 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); | 303 PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry); |
306 PrefsTabHelper::RegisterUserPrefs(registry); | 304 PrefsTabHelper::RegisterUserPrefs(registry); |
307 Profile::RegisterUserPrefs(registry); | 305 Profile::RegisterUserPrefs(registry); |
308 ProfileImpl::RegisterUserPrefs(registry); | 306 ProfileImpl::RegisterUserPrefs(registry); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
456 } | 454 } |
457 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 455 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
458 | 456 |
459 current_version |= GOOGLE_URL_TRACKER_PREFS; | 457 current_version |= GOOGLE_URL_TRACKER_PREFS; |
460 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 458 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
461 current_version); | 459 current_version); |
462 } | 460 } |
463 } | 461 } |
464 | 462 |
465 } // namespace chrome | 463 } // namespace chrome |
OLD | NEW |