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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 #endif | 282 #endif |
284 | 283 |
285 #if defined(ENABLE_MANAGED_USERS) | 284 #if defined(ENABLE_MANAGED_USERS) |
286 ManagedUserService::RegisterUserPrefs(registry); | 285 ManagedUserService::RegisterUserPrefs(registry); |
287 #endif | 286 #endif |
288 | 287 |
289 #if defined(ENABLE_NOTIFICATIONS) | 288 #if defined(ENABLE_NOTIFICATIONS) |
290 DesktopNotificationService::RegisterUserPrefs(registry); | 289 DesktopNotificationService::RegisterUserPrefs(registry); |
291 #endif | 290 #endif |
292 | 291 |
293 #if defined(ENABLE_WEB_INTENTS) | |
294 web_intents::RegisterUserPrefs(registry); | |
295 #endif | |
296 | |
297 #if defined(TOOLKIT_VIEWS) | 292 #if defined(TOOLKIT_VIEWS) |
298 RegisterInvertBubbleUserPrefs(registry); | 293 RegisterInvertBubbleUserPrefs(registry); |
299 #elif defined(TOOLKIT_GTK) | 294 #elif defined(TOOLKIT_GTK) |
300 BrowserWindowGtk::RegisterUserPrefs(user_prefs, registry); | 295 BrowserWindowGtk::RegisterUserPrefs(user_prefs, registry); |
301 #endif | 296 #endif |
302 | 297 |
303 #if defined(OS_ANDROID) | 298 #if defined(OS_ANDROID) |
304 PromoHandler::RegisterUserPrefs(registry); | 299 PromoHandler::RegisterUserPrefs(registry); |
305 #endif | 300 #endif |
306 | 301 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 } | 410 } |
416 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 411 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
417 | 412 |
418 current_version |= GOOGLE_URL_TRACKER_PREFS; | 413 current_version |= GOOGLE_URL_TRACKER_PREFS; |
419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 414 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
420 current_version); | 415 current_version); |
421 } | 416 } |
422 } | 417 } |
423 | 418 |
424 } // namespace chrome | 419 } // namespace chrome |
OLD | NEW |