| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 #endif | 100 #endif |
| 101 | 101 |
| 102 #if defined(OS_CHROMEOS) | 102 #if defined(OS_CHROMEOS) |
| 103 #include "chrome/browser/chromeos/audio/audio_handler.h" | 103 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 104 #include "chrome/browser/chromeos/customization_document.h" | 104 #include "chrome/browser/chromeos/customization_document.h" |
| 105 #include "chrome/browser/chromeos/display/display_preferences.h" | 105 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 106 #include "chrome/browser/chromeos/login/user_image_manager.h" | 106 #include "chrome/browser/chromeos/login/user_image_manager.h" |
| 107 #include "chrome/browser/chromeos/login/user_manager.h" | 107 #include "chrome/browser/chromeos/login/user_manager.h" |
| 108 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 108 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 109 #include "chrome/browser/chromeos/login/wizard_controller.h" | 109 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 110 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 111 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 112 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 110 #include "chrome/browser/chromeos/preferences.h" | 113 #include "chrome/browser/chromeos/preferences.h" |
| 111 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 114 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 112 #include "chrome/browser/chromeos/settings/device_settings_cache.h" | 115 #include "chrome/browser/chromeos/settings/device_settings_cache.h" |
| 113 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 116 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 114 #include "chrome/browser/policy/auto_enrollment_client.h" | |
| 115 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" | |
| 116 #include "chrome/browser/policy/device_status_collector.h" | |
| 117 #else | 117 #else |
| 118 #include "chrome/browser/extensions/default_apps.h" | 118 #include "chrome/browser/extensions/default_apps.h" |
| 119 #endif | 119 #endif |
| 120 | 120 |
| 121 #if defined(USE_ASH) | 121 #if defined(USE_ASH) |
| 122 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 122 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 123 #endif | 123 #endif |
| 124 | 124 |
| 125 #if !defined(OS_ANDROID) | 125 #if !defined(OS_ANDROID) |
| 126 #include "chrome/browser/chrome_to_mobile_service.h" | 126 #include "chrome/browser/chrome_to_mobile_service.h" |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 } | 395 } |
| 396 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 396 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 397 | 397 |
| 398 current_version |= GOOGLE_URL_TRACKER_PREFS; | 398 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 399 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 399 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 400 current_version); | 400 current_version); |
| 401 } | 401 } |
| 402 } | 402 } |
| 403 | 403 |
| 404 } // namespace chrome | 404 } // namespace chrome |
| OLD | NEW |