| 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 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 21 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
| 22 #include "chrome/browser/extensions/app_launcher.h" | 22 #include "chrome/browser/extensions/app_launcher.h" |
| 23 #include "chrome/browser/extensions/component_loader.h" | 23 #include "chrome/browser/extensions/component_loader.h" |
| 24 #include "chrome/browser/extensions/extension_prefs.h" | 24 #include "chrome/browser/extensions/extension_prefs.h" |
| 25 #include "chrome/browser/extensions/extension_web_ui.h" | 25 #include "chrome/browser/extensions/extension_web_ui.h" |
| 26 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 26 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 27 #include "chrome/browser/first_run/first_run.h" | 27 #include "chrome/browser/first_run/first_run.h" |
| 28 #include "chrome/browser/geolocation/geolocation_prefs.h" | 28 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 29 #include "chrome/browser/google/google_url_tracker.h" | 29 #include "chrome/browser/google/google_url_tracker.h" |
| 30 #include "chrome/browser/google/google_url_tracker_factory.h" | 30 #include "chrome/browser/google/google_url_tracker_factory.h" |
| 31 #include "chrome/browser/intents/web_intents_util.h" | |
| 32 #include "chrome/browser/intranet_redirect_detector.h" | 31 #include "chrome/browser/intranet_redirect_detector.h" |
| 33 #include "chrome/browser/managed_mode/managed_mode.h" | 32 #include "chrome/browser/managed_mode/managed_mode.h" |
| 34 #include "chrome/browser/managed_mode/managed_user_service.h" | 33 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 35 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 34 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 36 #include "chrome/browser/media/media_stream_devices_controller.h" | 35 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 37 #include "chrome/browser/metrics/metrics_log.h" | 36 #include "chrome/browser/metrics/metrics_log.h" |
| 38 #include "chrome/browser/metrics/metrics_service.h" | 37 #include "chrome/browser/metrics/metrics_service.h" |
| 39 #include "chrome/browser/metrics/variations/variations_service.h" | 38 #include "chrome/browser/metrics/variations/variations_service.h" |
| 40 #include "chrome/browser/net/http_server_properties_manager.h" | 39 #include "chrome/browser/net/http_server_properties_manager.h" |
| 41 #include "chrome/browser/net/net_pref_observer.h" | 40 #include "chrome/browser/net/net_pref_observer.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 #endif | 276 #endif |
| 278 | 277 |
| 279 #if defined(ENABLE_MANAGED_USERS) | 278 #if defined(ENABLE_MANAGED_USERS) |
| 280 ManagedUserService::RegisterUserPrefs(user_prefs); | 279 ManagedUserService::RegisterUserPrefs(user_prefs); |
| 281 #endif | 280 #endif |
| 282 | 281 |
| 283 #if defined(ENABLE_NOTIFICATIONS) | 282 #if defined(ENABLE_NOTIFICATIONS) |
| 284 DesktopNotificationService::RegisterUserPrefs(user_prefs); | 283 DesktopNotificationService::RegisterUserPrefs(user_prefs); |
| 285 #endif | 284 #endif |
| 286 | 285 |
| 287 #if defined(ENABLE_WEB_INTENTS) | |
| 288 web_intents::RegisterUserPrefs(user_prefs); | |
| 289 #endif | |
| 290 | |
| 291 #if defined(TOOLKIT_VIEWS) | 286 #if defined(TOOLKIT_VIEWS) |
| 292 RegisterInvertBubbleUserPrefs(user_prefs); | 287 RegisterInvertBubbleUserPrefs(user_prefs); |
| 293 #elif defined(TOOLKIT_GTK) | 288 #elif defined(TOOLKIT_GTK) |
| 294 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 289 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 295 #endif | 290 #endif |
| 296 | 291 |
| 297 #if defined(OS_ANDROID) | 292 #if defined(OS_ANDROID) |
| 298 PromoHandler::RegisterUserPrefs(user_prefs); | 293 PromoHandler::RegisterUserPrefs(user_prefs); |
| 299 #endif | 294 #endif |
| 300 | 295 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 } | 399 } |
| 405 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 400 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 406 | 401 |
| 407 current_version |= GOOGLE_URL_TRACKER_PREFS; | 402 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 408 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 403 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 409 current_version); | 404 current_version); |
| 410 } | 405 } |
| 411 } | 406 } |
| 412 | 407 |
| 413 } // namespace chrome | 408 } // namespace chrome |
| OLD | NEW |