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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 116 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
117 #include "chrome/browser/chromeos/audio/audio_handler.h" | 117 #include "chrome/browser/chromeos/audio/audio_handler.h" |
118 #include "chrome/browser/chromeos/customization_document.h" | 118 #include "chrome/browser/chromeos/customization_document.h" |
119 #include "chrome/browser/chromeos/display/display_preferences.h" | 119 #include "chrome/browser/chromeos/display/display_preferences.h" |
120 #include "chrome/browser/chromeos/login/login_utils.h" | 120 #include "chrome/browser/chromeos/login/login_utils.h" |
121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" | 121 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" |
122 #include "chrome/browser/chromeos/login/user_image_manager.h" | 122 #include "chrome/browser/chromeos/login/user_image_manager.h" |
123 #include "chrome/browser/chromeos/login/user_manager.h" | 123 #include "chrome/browser/chromeos/login/user_manager.h" |
124 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 124 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
125 #include "chrome/browser/chromeos/login/wizard_controller.h" | 125 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 126 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 127 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 128 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
126 #include "chrome/browser/chromeos/preferences.h" | 129 #include "chrome/browser/chromeos/preferences.h" |
127 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 130 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
128 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 131 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
129 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 132 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
130 #include "chrome/browser/policy/auto_enrollment_client.h" | |
131 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" | |
132 #include "chrome/browser/policy/device_status_collector.h" | |
133 #else | 133 #else |
134 #include "chrome/browser/extensions/default_apps.h" | 134 #include "chrome/browser/extensions/default_apps.h" |
135 #endif | 135 #endif |
136 | 136 |
137 #if defined(USE_ASH) | 137 #if defined(USE_ASH) |
138 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 138 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
139 #endif | 139 #endif |
140 | 140 |
141 #if !defined(OS_ANDROID) | 141 #if !defined(OS_ANDROID) |
142 #include "chrome/browser/chrome_to_mobile_service.h" | 142 #include "chrome/browser/chrome_to_mobile_service.h" |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 } | 435 } |
436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 436 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
437 | 437 |
438 current_version |= GOOGLE_URL_TRACKER_PREFS; | 438 current_version |= GOOGLE_URL_TRACKER_PREFS; |
439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 439 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
440 current_version); | 440 current_version); |
441 } | 441 } |
442 } | 442 } |
443 | 443 |
444 } // namespace chrome | 444 } // namespace chrome |
OLD | NEW |