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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "chrome/browser/net/http_server_properties_manager.h" | 45 #include "chrome/browser/net/http_server_properties_manager.h" |
46 #include "chrome/browser/net/net_pref_observer.h" | 46 #include "chrome/browser/net/net_pref_observer.h" |
47 #include "chrome/browser/net/predictor.h" | 47 #include "chrome/browser/net/predictor.h" |
48 #include "chrome/browser/net/ssl_config_service_manager.h" | 48 #include "chrome/browser/net/ssl_config_service_manager.h" |
49 #include "chrome/browser/notifications/desktop_notification_service.h" | 49 #include "chrome/browser/notifications/desktop_notification_service.h" |
50 #include "chrome/browser/notifications/notification_prefs_manager.h" | 50 #include "chrome/browser/notifications/notification_prefs_manager.h" |
51 #include "chrome/browser/password_manager/password_manager.h" | 51 #include "chrome/browser/password_manager/password_manager.h" |
52 #include "chrome/browser/pepper_flash_settings_manager.h" | 52 #include "chrome/browser/pepper_flash_settings_manager.h" |
53 #include "chrome/browser/plugins/plugin_finder.h" | 53 #include "chrome/browser/plugins/plugin_finder.h" |
54 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 54 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
55 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
56 #include "chrome/browser/prefs/pref_service_syncable.h" | 55 #include "chrome/browser/prefs/pref_service_syncable.h" |
57 #include "chrome/browser/prefs/session_startup_pref.h" | 56 #include "chrome/browser/prefs/session_startup_pref.h" |
58 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" | 57 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" |
59 #include "chrome/browser/printing/print_dialog_cloud.h" | 58 #include "chrome/browser/printing/print_dialog_cloud.h" |
60 #include "chrome/browser/profiles/chrome_version_service.h" | 59 #include "chrome/browser/profiles/chrome_version_service.h" |
61 #include "chrome/browser/profiles/profile.h" | 60 #include "chrome/browser/profiles/profile.h" |
62 #include "chrome/browser/profiles/profile_impl.h" | 61 #include "chrome/browser/profiles/profile_impl.h" |
63 #include "chrome/browser/profiles/profile_info_cache.h" | 62 #include "chrome/browser/profiles/profile_info_cache.h" |
64 #include "chrome/browser/profiles/profile_manager.h" | 63 #include "chrome/browser/profiles/profile_manager.h" |
65 #include "chrome/browser/renderer_host/web_cache_manager.h" | 64 #include "chrome/browser/renderer_host/web_cache_manager.h" |
(...skipping 17 matching lines...) Expand all Loading... |
83 #include "chrome/browser/ui/webui/flags_ui.h" | 82 #include "chrome/browser/ui/webui/flags_ui.h" |
84 #include "chrome/browser/ui/webui/instant_ui.h" | 83 #include "chrome/browser/ui/webui/instant_ui.h" |
85 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 84 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
86 #include "chrome/browser/ui/webui/plugins_ui.h" | 85 #include "chrome/browser/ui/webui/plugins_ui.h" |
87 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" | 86 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" |
88 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 87 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
89 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" | 88 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" |
90 #include "chrome/browser/upgrade_detector.h" | 89 #include "chrome/browser/upgrade_detector.h" |
91 #include "chrome/browser/web_resource/promo_resource_service.h" | 90 #include "chrome/browser/web_resource/promo_resource_service.h" |
92 #include "chrome/common/pref_names.h" | 91 #include "chrome/common/pref_names.h" |
| 92 #include "components/user_prefs/pref_registry_syncable.h" |
93 #include "content/public/browser/render_process_host.h" | 93 #include "content/public/browser/render_process_host.h" |
94 | 94 |
95 #if defined(ENABLE_CONFIGURATION_POLICY) | 95 #if defined(ENABLE_CONFIGURATION_POLICY) |
96 #include "chrome/browser/policy/browser_policy_connector.h" | 96 #include "chrome/browser/policy/browser_policy_connector.h" |
97 #include "chrome/browser/policy/policy_statistics_collector.h" | 97 #include "chrome/browser/policy/policy_statistics_collector.h" |
98 #include "chrome/browser/policy/url_blacklist_manager.h" | 98 #include "chrome/browser/policy/url_blacklist_manager.h" |
99 #endif | 99 #endif |
100 | 100 |
101 #if defined(OS_MACOSX) | 101 #if defined(OS_MACOSX) |
102 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 102 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 } | 432 } |
433 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 433 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
434 | 434 |
435 current_version |= GOOGLE_URL_TRACKER_PREFS; | 435 current_version |= GOOGLE_URL_TRACKER_PREFS; |
436 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 436 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
437 current_version); | 437 current_version); |
438 } | 438 } |
439 } | 439 } |
440 | 440 |
441 } // namespace chrome | 441 } // namespace chrome |
OLD | NEW |