OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 | 87 |
88 #if defined(TOOLKIT_GTK) | 88 #if defined(TOOLKIT_GTK) |
89 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 89 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
90 #endif | 90 #endif |
91 | 91 |
92 #if defined(OS_CHROMEOS) | 92 #if defined(OS_CHROMEOS) |
93 #include "chrome/browser/chromeos/audio/audio_handler.h" | 93 #include "chrome/browser/chromeos/audio/audio_handler.h" |
94 #include "chrome/browser/chromeos/customization_document.h" | 94 #include "chrome/browser/chromeos/customization_document.h" |
95 #include "chrome/browser/chromeos/login/signed_settings_cache.h" | 95 #include "chrome/browser/chromeos/login/signed_settings_cache.h" |
96 #include "chrome/browser/chromeos/login/user_manager.h" | 96 #include "chrome/browser/chromeos/login/user_manager.h" |
| 97 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
97 #include "chrome/browser/chromeos/login/wizard_controller.h" | 98 #include "chrome/browser/chromeos/login/wizard_controller.h" |
98 #include "chrome/browser/chromeos/preferences.h" | 99 #include "chrome/browser/chromeos/preferences.h" |
99 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 100 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
100 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 101 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
101 #include "chrome/browser/policy/auto_enrollment_client.h" | 102 #include "chrome/browser/policy/auto_enrollment_client.h" |
102 #include "chrome/browser/policy/device_status_collector.h" | 103 #include "chrome/browser/policy/device_status_collector.h" |
103 #else | 104 #else |
104 #include "chrome/browser/extensions/default_apps.h" | 105 #include "chrome/browser/extensions/default_apps.h" |
105 #endif | 106 #endif |
106 | 107 |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 #endif | 173 #endif |
173 | 174 |
174 #if defined(OS_CHROMEOS) | 175 #if defined(OS_CHROMEOS) |
175 chromeos::AudioHandler::RegisterPrefs(local_state); | 176 chromeos::AudioHandler::RegisterPrefs(local_state); |
176 chromeos::language_prefs::RegisterPrefs(local_state); | 177 chromeos::language_prefs::RegisterPrefs(local_state); |
177 chromeos::DataPromoNotification::RegisterPrefs(local_state); | 178 chromeos::DataPromoNotification::RegisterPrefs(local_state); |
178 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); | 179 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); |
179 chromeos::UserManager::RegisterPrefs(local_state); | 180 chromeos::UserManager::RegisterPrefs(local_state); |
180 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); | 181 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); |
181 chromeos::signed_settings_cache::RegisterPrefs(local_state); | 182 chromeos::signed_settings_cache::RegisterPrefs(local_state); |
| 183 chromeos::WallpaperManager::RegisterPrefs(local_state); |
182 chromeos::WizardController::RegisterPrefs(local_state); | 184 chromeos::WizardController::RegisterPrefs(local_state); |
183 policy::AutoEnrollmentClient::RegisterPrefs(local_state); | 185 policy::AutoEnrollmentClient::RegisterPrefs(local_state); |
184 policy::DeviceStatusCollector::RegisterPrefs(local_state); | 186 policy::DeviceStatusCollector::RegisterPrefs(local_state); |
185 #endif | 187 #endif |
186 | 188 |
187 #if defined(OS_MACOSX) | 189 #if defined(OS_MACOSX) |
188 RegisterObsoleteOSInfobarPrefs(local_state); | 190 RegisterObsoleteOSInfobarPrefs(local_state); |
189 confirm_quit::RegisterLocalState(local_state); | 191 confirm_quit::RegisterLocalState(local_state); |
190 #endif | 192 #endif |
191 } | 193 } |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 } | 334 } |
333 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 335 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
334 | 336 |
335 current_version |= GOOGLE_URL_TRACKER_PREFS; | 337 current_version |= GOOGLE_URL_TRACKER_PREFS; |
336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 338 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
337 current_version); | 339 current_version); |
338 } | 340 } |
339 } | 341 } |
340 | 342 |
341 } // namespace chrome | 343 } // namespace chrome |
OLD | NEW |