| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" | 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 13 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 15 #include "chrome/browser/debugger/devtools_window.h" | 15 #include "chrome/browser/debugger/devtools_window.h" |
| 16 #include "chrome/browser/download/download_prefs.h" | 16 #include "chrome/browser/download/download_prefs.h" |
| 17 #include "chrome/browser/extensions/api/commands/command_service.h" | 17 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 18 #include "chrome/browser/extensions/apps_promo.h" | 18 #include "chrome/browser/extensions/apps_promo.h" |
| 19 #include "chrome/browser/extensions/component_loader.h" | 19 #include "chrome/browser/extensions/component_loader.h" |
| 20 #include "chrome/browser/extensions/extension_prefs.h" | 20 #include "chrome/browser/extensions/extension_prefs.h" |
| 21 #include "chrome/browser/extensions/extension_web_ui.h" | 21 #include "chrome/browser/extensions/extension_web_ui.h" |
| 22 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 22 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 23 #include "chrome/browser/geolocation/geolocation_prefs.h" | 23 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 24 #include "chrome/browser/google/google_url_tracker.h" | 24 #include "chrome/browser/google/google_url_tracker.h" |
| 25 #include "chrome/browser/google/google_url_tracker_factory.h" | 25 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 26 #include "chrome/browser/instant/instant_controller.h" | 26 #include "chrome/browser/instant/instant_controller.h" |
| 27 #include "chrome/browser/intents/web_intents_util.h" | 27 #include "chrome/browser/intents/web_intents_util.h" |
| 28 #include "chrome/browser/intranet_redirect_detector.h" | 28 #include "chrome/browser/intranet_redirect_detector.h" |
| 29 #include "chrome/browser/managed_mode.h" | 29 #include "chrome/browser/managed_mode.h" |
| 30 #include "chrome/browser/media/media_stream_devices_prefs.h" |
| 30 #include "chrome/browser/metrics/metrics_log.h" | 31 #include "chrome/browser/metrics/metrics_log.h" |
| 31 #include "chrome/browser/metrics/metrics_service.h" | 32 #include "chrome/browser/metrics/metrics_service.h" |
| 32 #include "chrome/browser/metrics/variations_service.h" | 33 #include "chrome/browser/metrics/variations_service.h" |
| 33 #include "chrome/browser/net/http_server_properties_manager.h" | 34 #include "chrome/browser/net/http_server_properties_manager.h" |
| 34 #include "chrome/browser/net/net_pref_observer.h" | 35 #include "chrome/browser/net/net_pref_observer.h" |
| 35 #include "chrome/browser/net/predictor.h" | 36 #include "chrome/browser/net/predictor.h" |
| 36 #include "chrome/browser/net/ssl_config_service_manager.h" | 37 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 37 #include "chrome/browser/notifications/desktop_notification_service.h" | 38 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 38 #include "chrome/browser/notifications/notification_prefs_manager.h" | 39 #include "chrome/browser/notifications/notification_prefs_manager.h" |
| 39 #include "chrome/browser/page_info_model.h" | 40 #include "chrome/browser/page_info_model.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 DownloadPrefs::RegisterUserPrefs(user_prefs); | 190 DownloadPrefs::RegisterUserPrefs(user_prefs); |
| 190 extensions::CommandService::RegisterUserPrefs(user_prefs); | 191 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 191 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); | 192 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); |
| 192 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 193 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 193 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 194 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 194 ExtensionWebUI::RegisterUserPrefs(user_prefs); | 195 ExtensionWebUI::RegisterUserPrefs(user_prefs); |
| 195 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); | 196 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); |
| 196 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 197 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
| 197 IncognitoModePrefs::RegisterUserPrefs(user_prefs); | 198 IncognitoModePrefs::RegisterUserPrefs(user_prefs); |
| 198 InstantController::RegisterUserPrefs(user_prefs); | 199 InstantController::RegisterUserPrefs(user_prefs); |
| 200 MediaStreamDevicesPrefs::RegisterUserPrefs(user_prefs); |
| 199 NetPrefObserver::RegisterPrefs(user_prefs); | 201 NetPrefObserver::RegisterPrefs(user_prefs); |
| 200 NewTabUI::RegisterUserPrefs(user_prefs); | 202 NewTabUI::RegisterUserPrefs(user_prefs); |
| 201 PasswordManager::RegisterUserPrefs(user_prefs); | 203 PasswordManager::RegisterUserPrefs(user_prefs); |
| 202 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); | 204 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); |
| 203 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 205 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
| 204 ProfileImpl::RegisterUserPrefs(user_prefs); | 206 ProfileImpl::RegisterUserPrefs(user_prefs); |
| 205 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 207 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
| 206 SessionStartupPref::RegisterUserPrefs(user_prefs); | 208 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 207 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 209 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
| 208 TranslatePrefs::RegisterUserPrefs(user_prefs); | 210 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 } | 315 } |
| 314 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 316 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 315 | 317 |
| 316 current_version |= GOOGLE_URL_TRACKER_PREFS; | 318 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 317 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 319 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 318 current_version); | 320 current_version); |
| 319 } | 321 } |
| 320 } | 322 } |
| 321 | 323 |
| 322 } // namespace browser | 324 } // namespace browser |
| OLD | NEW |