| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 ProtocolHandlerRegistry::RegisterUserPrefs(user_prefs); | 255 ProtocolHandlerRegistry::RegisterUserPrefs(user_prefs); |
| 255 RegisterBrowserUserPrefs(user_prefs); | 256 RegisterBrowserUserPrefs(user_prefs); |
| 256 SessionStartupPref::RegisterUserPrefs(user_prefs); | 257 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 257 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 258 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
| 258 TranslatePrefs::RegisterUserPrefs(user_prefs); | 259 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| 259 | 260 |
| 260 #if defined(ENABLE_CONFIGURATION_POLICY) | 261 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 261 policy::URLBlacklistManager::RegisterUserPrefs(user_prefs); | 262 policy::URLBlacklistManager::RegisterUserPrefs(user_prefs); |
| 262 #endif | 263 #endif |
| 263 | 264 |
| 265 #if defined(ENABLE_MANAGED_USERS) |
| 266 ManagedUserService::RegisterUserPrefs(user_prefs); |
| 267 #endif |
| 268 |
| 264 #if defined(ENABLE_WEB_INTENTS) | 269 #if defined(ENABLE_WEB_INTENTS) |
| 265 web_intents::RegisterUserPrefs(user_prefs); | 270 web_intents::RegisterUserPrefs(user_prefs); |
| 266 #endif | 271 #endif |
| 267 | 272 |
| 268 #if defined(TOOLKIT_VIEWS) | 273 #if defined(TOOLKIT_VIEWS) |
| 269 RegisterInvertBubbleUserPrefs(user_prefs); | 274 RegisterInvertBubbleUserPrefs(user_prefs); |
| 270 #elif defined(TOOLKIT_GTK) | 275 #elif defined(TOOLKIT_GTK) |
| 271 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 276 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 272 #endif | 277 #endif |
| 273 | 278 |
| 274 #if defined(OS_ANDROID) | 279 #if defined(OS_ANDROID) |
| 275 PromoHandler::RegisterUserPrefs(user_prefs); | 280 PromoHandler::RegisterUserPrefs(user_prefs); |
| 276 #endif | 281 #endif |
| 277 | 282 |
| 278 #if defined(USE_ASH) | 283 #if defined(USE_ASH) |
| 279 ash::RegisterChromeLauncherUserPrefs(user_prefs); | 284 ash::RegisterChromeLauncherUserPrefs(user_prefs); |
| 280 #endif | 285 #endif |
| 281 | 286 |
| 282 #if !defined(OS_ANDROID) | 287 #if !defined(OS_ANDROID) |
| 283 TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); | 288 TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); |
| 284 ChromeToMobileService::RegisterUserPrefs(user_prefs); | 289 ChromeToMobileService::RegisterUserPrefs(user_prefs); |
| 285 DevToolsWindow::RegisterUserPrefs(user_prefs); | 290 DevToolsWindow::RegisterUserPrefs(user_prefs); |
| 286 extensions::CommandService::RegisterUserPrefs(user_prefs); | 291 extensions::CommandService::RegisterUserPrefs(user_prefs); |
| 287 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); | 292 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); |
| 288 ManagedMode::RegisterUserPrefs(user_prefs); | |
| 289 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); | 293 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); |
| 290 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 294 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 291 PluginsUI::RegisterUserPrefs(user_prefs); | 295 PluginsUI::RegisterUserPrefs(user_prefs); |
| 292 printing::StickySettings::RegisterUserPrefs(user_prefs); | 296 printing::StickySettings::RegisterUserPrefs(user_prefs); |
| 293 RegisterAutolaunchUserPrefs(user_prefs); | 297 RegisterAutolaunchUserPrefs(user_prefs); |
| 294 SyncPromoUI::RegisterUserPrefs(user_prefs); | 298 SyncPromoUI::RegisterUserPrefs(user_prefs); |
| 295 #endif | 299 #endif |
| 296 | 300 |
| 297 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 301 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 298 default_apps::RegisterUserPrefs(user_prefs); | 302 default_apps::RegisterUserPrefs(user_prefs); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 } | 384 } |
| 381 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 385 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 382 | 386 |
| 383 current_version |= GOOGLE_URL_TRACKER_PREFS; | 387 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 384 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 388 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 385 current_version); | 389 current_version); |
| 386 } | 390 } |
| 387 } | 391 } |
| 388 | 392 |
| 389 } // namespace chrome | 393 } // namespace chrome |
| OLD | NEW |