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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/about_flags.h" | 10 #include "chrome/browser/about_flags.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 26 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
27 #include "chrome/browser/extensions/component_loader.h" | 27 #include "chrome/browser/extensions/component_loader.h" |
28 #include "chrome/browser/extensions/extension_prefs.h" | 28 #include "chrome/browser/extensions/extension_prefs.h" |
29 #include "chrome/browser/extensions/extension_web_ui.h" | 29 #include "chrome/browser/extensions/extension_web_ui.h" |
30 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 30 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
31 #include "chrome/browser/first_run/first_run.h" | 31 #include "chrome/browser/first_run/first_run.h" |
32 #include "chrome/browser/geolocation/geolocation_prefs.h" | 32 #include "chrome/browser/geolocation/geolocation_prefs.h" |
33 #include "chrome/browser/google/google_url_tracker.h" | 33 #include "chrome/browser/google/google_url_tracker.h" |
34 #include "chrome/browser/google/google_url_tracker_factory.h" | 34 #include "chrome/browser/google/google_url_tracker_factory.h" |
35 #include "chrome/browser/gpu/gl_string_manager.h" | 35 #include "chrome/browser/gpu/gl_string_manager.h" |
| 36 #include "chrome/browser/instant/search.h" |
36 #include "chrome/browser/intranet_redirect_detector.h" | 37 #include "chrome/browser/intranet_redirect_detector.h" |
37 #include "chrome/browser/io_thread.h" | 38 #include "chrome/browser/io_thread.h" |
38 #include "chrome/browser/managed_mode/managed_mode.h" | 39 #include "chrome/browser/managed_mode/managed_mode.h" |
39 #include "chrome/browser/managed_mode/managed_user_service.h" | 40 #include "chrome/browser/managed_mode/managed_user_service.h" |
40 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 41 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
41 #include "chrome/browser/media/media_stream_devices_controller.h" | 42 #include "chrome/browser/media/media_stream_devices_controller.h" |
42 #include "chrome/browser/metrics/metrics_log.h" | 43 #include "chrome/browser/metrics/metrics_log.h" |
43 #include "chrome/browser/metrics/metrics_service.h" | 44 #include "chrome/browser/metrics/metrics_service.h" |
44 #include "chrome/browser/metrics/variations/variations_service.h" | 45 #include "chrome/browser/metrics/variations/variations_service.h" |
45 #include "chrome/browser/net/http_server_properties_manager.h" | 46 #include "chrome/browser/net/http_server_properties_manager.h" |
(...skipping 21 matching lines...) Expand all Loading... |
67 #include "chrome/browser/sync/invalidations/invalidator_storage.h" | 68 #include "chrome/browser/sync/invalidations/invalidator_storage.h" |
68 #include "chrome/browser/sync/sync_prefs.h" | 69 #include "chrome/browser/sync/sync_prefs.h" |
69 #include "chrome/browser/task_manager/task_manager.h" | 70 #include "chrome/browser/task_manager/task_manager.h" |
70 #include "chrome/browser/translate/translate_prefs.h" | 71 #include "chrome/browser/translate/translate_prefs.h" |
71 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 72 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
72 #include "chrome/browser/ui/app_list/app_list_service.h" | 73 #include "chrome/browser/ui/app_list/app_list_service.h" |
73 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" | 74 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" |
74 #include "chrome/browser/ui/browser_ui_prefs.h" | 75 #include "chrome/browser/ui/browser_ui_prefs.h" |
75 #include "chrome/browser/ui/network_profile_bubble.h" | 76 #include "chrome/browser/ui/network_profile_bubble.h" |
76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 77 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
77 #include "chrome/browser/ui/search/search.h" | |
78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
79 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 79 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
82 #include "chrome/browser/ui/webui/flags_ui.h" | 82 #include "chrome/browser/ui/webui/flags_ui.h" |
83 #include "chrome/browser/ui/webui/instant_ui.h" | 83 #include "chrome/browser/ui/webui/instant_ui.h" |
84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
85 #include "chrome/browser/ui/webui/plugins_ui.h" | 85 #include "chrome/browser/ui/webui/plugins_ui.h" |
86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 } | 433 } |
434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
435 | 435 |
436 current_version |= GOOGLE_URL_TRACKER_PREFS; | 436 current_version |= GOOGLE_URL_TRACKER_PREFS; |
437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
438 current_version); | 438 current_version); |
439 } | 439 } |
440 } | 440 } |
441 | 441 |
442 } // namespace chrome | 442 } // namespace chrome |
OLD | NEW |