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/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 #if defined(OS_CHROMEOS) | 134 #if defined(OS_CHROMEOS) |
135 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 135 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
136 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" | 136 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" |
137 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" | 137 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" |
138 #include "chrome/browser/chromeos/customization_document.h" | 138 #include "chrome/browser/chromeos/customization_document.h" |
139 #include "chrome/browser/chromeos/display/display_preferences.h" | 139 #include "chrome/browser/chromeos/display/display_preferences.h" |
140 #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 140 #include "chrome/browser/chromeos/extensions/echo_private_api.h" |
141 #include "chrome/browser/chromeos/first_run/first_run.h" | 141 #include "chrome/browser/chromeos/first_run/first_run.h" |
142 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" | 142 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" |
143 #include "chrome/browser/chromeos/login/login_utils.h" | 143 #include "chrome/browser/chromeos/login/login_utils.h" |
144 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" | |
145 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 144 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
146 #include "chrome/browser/chromeos/login/startup_utils.h" | 145 #include "chrome/browser/chromeos/login/startup_utils.h" |
147 #include "chrome/browser/chromeos/login/user_image_manager.h" | 146 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
148 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" | 147 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
149 #include "chrome/browser/chromeos/login/user_manager.h" | 148 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" |
150 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 149 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 150 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
151 #include "chrome/browser/chromeos/net/proxy_config_handler.h" | 151 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
152 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 152 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
153 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 153 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
154 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 154 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
155 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 155 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
156 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 156 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
157 #include "chrome/browser/chromeos/power/power_prefs.h" | 157 #include "chrome/browser/chromeos/power/power_prefs.h" |
158 #include "chrome/browser/chromeos/preferences.h" | 158 #include "chrome/browser/chromeos/preferences.h" |
159 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" | 159 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" |
160 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 160 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
572 current_version); | 572 current_version); |
573 } | 573 } |
574 | 574 |
575 #if defined(OS_CHROMEOS) | 575 #if defined(OS_CHROMEOS) |
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); | 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); |
577 #endif | 577 #endif |
578 } | 578 } |
579 | 579 |
580 } // namespace chrome | 580 } // namespace chrome |
OLD | NEW |