| 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 "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" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/extensions/extension_prefs.h" | 22 #include "chrome/browser/extensions/extension_prefs.h" |
| 23 #include "chrome/browser/extensions/extension_web_ui.h" | 23 #include "chrome/browser/extensions/extension_web_ui.h" |
| 24 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 24 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 25 #include "chrome/browser/first_run/first_run.h" | 25 #include "chrome/browser/first_run/first_run.h" |
| 26 #include "chrome/browser/geolocation/geolocation_prefs.h" | 26 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 27 #include "chrome/browser/google/google_url_tracker.h" | 27 #include "chrome/browser/google/google_url_tracker.h" |
| 28 #include "chrome/browser/google/google_url_tracker_factory.h" | 28 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 29 #include "chrome/browser/intents/web_intents_util.h" | 29 #include "chrome/browser/intents/web_intents_util.h" |
| 30 #include "chrome/browser/intranet_redirect_detector.h" | 30 #include "chrome/browser/intranet_redirect_detector.h" |
| 31 #include "chrome/browser/managed_mode/managed_mode.h" | 31 #include "chrome/browser/managed_mode/managed_mode.h" |
| 32 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 32 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 33 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 33 #include "chrome/browser/media/media_stream_devices_controller.h" | 34 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 34 #include "chrome/browser/metrics/metrics_log.h" | 35 #include "chrome/browser/metrics/metrics_log.h" |
| 35 #include "chrome/browser/metrics/metrics_service.h" | 36 #include "chrome/browser/metrics/metrics_service.h" |
| 36 #include "chrome/browser/metrics/variations/variations_service.h" | 37 #include "chrome/browser/metrics/variations/variations_service.h" |
| 37 #include "chrome/browser/net/http_server_properties_manager.h" | 38 #include "chrome/browser/net/http_server_properties_manager.h" |
| 38 #include "chrome/browser/net/net_pref_observer.h" | 39 #include "chrome/browser/net/net_pref_observer.h" |
| 39 #include "chrome/browser/net/predictor.h" | 40 #include "chrome/browser/net/predictor.h" |
| 40 #include "chrome/browser/net/ssl_config_service_manager.h" | 41 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 41 #include "chrome/browser/notifications/desktop_notification_service.h" | 42 #include "chrome/browser/notifications/desktop_notification_service.h" |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 #if defined(USE_ASH) | 277 #if defined(USE_ASH) |
| 277 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 278 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 278 #endif | 279 #endif |
| 279 | 280 |
| 280 #if !defined(OS_ANDROID) | 281 #if !defined(OS_ANDROID) |
| 281 TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); | 282 TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); |
| 282 ChromeToMobileService::RegisterUserPrefs(user_prefs); | 283 ChromeToMobileService::RegisterUserPrefs(user_prefs); |
| 283 DevToolsWindow::RegisterUserPrefs(user_prefs); | 284 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 284 extensions::CommandService::RegisterUserPrefs(user_prefs); | 285 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 285 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 286 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 286 ManagedMode::RegisterUserPrefs(user_prefs); | 287 ManagedUserService::RegisterUserPrefs(user_prefs); |
| 287 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 288 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| 288 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 289 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 289 PluginsUI::RegisterUserPrefs(user_prefs); | 290 PluginsUI::RegisterUserPrefs(user_prefs); |
| 290 printing::StickySettings::RegisterUserPrefs(user_prefs); | 291 printing::StickySettings::RegisterUserPrefs(user_prefs); |
| 291 RegisterAutolaunchUserPrefs(user_prefs); | 292 RegisterAutolaunchUserPrefs(user_prefs); |
| 292 SyncPromoUI::RegisterUserPrefs(user_prefs); | 293 SyncPromoUI::RegisterUserPrefs(user_prefs); |
| 293 #endif | 294 #endif |
| 294 | 295 |
| 295 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 296 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 296 default_apps::RegisterUserPrefs(user_prefs); | 297 default_apps::RegisterUserPrefs(user_prefs); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 } | 379 } |
| 379 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 380 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 380 | 381 |
| 381 current_version |= GOOGLE_URL_TRACKER_PREFS; | 382 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 382 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 383 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 383 current_version); | 384 current_version); |
| 384 } | 385 } |
| 385 } | 386 } |
| 386 | 387 |
| 387 } // namespace chrome | 388 } // namespace chrome |
| OLD | NEW |