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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" | 109 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" |
110 #endif | 110 #endif |
111 | 111 |
112 #if defined(TOOLKIT_GTK) | 112 #if defined(TOOLKIT_GTK) |
113 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 113 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
114 #endif | 114 #endif |
115 | 115 |
116 #if defined(OS_CHROMEOS) | 116 #if defined(OS_CHROMEOS) |
117 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 117 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
118 #include "chrome/browser/chromeos/audio/audio_handler.h" | 118 #include "chrome/browser/chromeos/audio/audio_handler.h" |
| 119 #include "chrome/browser/chromeos/audio/audio_pref_handler_impl.h" |
119 #include "chrome/browser/chromeos/customization_document.h" | 120 #include "chrome/browser/chromeos/customization_document.h" |
120 #include "chrome/browser/chromeos/display/display_preferences.h" | 121 #include "chrome/browser/chromeos/display/display_preferences.h" |
121 #include "chrome/browser/chromeos/login/login_utils.h" | 122 #include "chrome/browser/chromeos/login/login_utils.h" |
122 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" | 123 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" |
123 #include "chrome/browser/chromeos/login/user_image_manager.h" | 124 #include "chrome/browser/chromeos/login/user_image_manager.h" |
124 #include "chrome/browser/chromeos/login/user_manager.h" | 125 #include "chrome/browser/chromeos/login/user_manager.h" |
125 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 126 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
126 #include "chrome/browser/chromeos/login/wizard_controller.h" | 127 #include "chrome/browser/chromeos/login/wizard_controller.h" |
127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 128 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 129 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 | 232 |
232 #if !defined(OS_ANDROID) | 233 #if !defined(OS_ANDROID) |
233 BackgroundModeManager::RegisterPrefs(registry); | 234 BackgroundModeManager::RegisterPrefs(registry); |
234 chrome_variations::VariationsService::RegisterPrefs(registry); | 235 chrome_variations::VariationsService::RegisterPrefs(registry); |
235 RegisterBrowserPrefs(registry); | 236 RegisterBrowserPrefs(registry); |
236 RegisterDefaultBrowserPromptPrefs(registry); | 237 RegisterDefaultBrowserPromptPrefs(registry); |
237 ManagedMode::RegisterPrefs(registry); | 238 ManagedMode::RegisterPrefs(registry); |
238 #endif | 239 #endif |
239 | 240 |
240 #if defined(OS_CHROMEOS) | 241 #if defined(OS_CHROMEOS) |
241 chromeos::AudioHandler::RegisterPrefs(registry); | 242 chromeos::AudioPrefHandlerImpl::RegisterPrefs(registry); |
242 chromeos::DataPromoNotification::RegisterPrefs(registry); | 243 chromeos::DataPromoNotification::RegisterPrefs(registry); |
243 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); | 244 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); |
244 chromeos::device_settings_cache::RegisterPrefs(registry); | 245 chromeos::device_settings_cache::RegisterPrefs(registry); |
245 chromeos::language_prefs::RegisterPrefs(registry); | 246 chromeos::language_prefs::RegisterPrefs(registry); |
246 chromeos::KioskAppManager::RegisterPrefs(registry); | 247 chromeos::KioskAppManager::RegisterPrefs(registry); |
247 chromeos::LoginUtils::RegisterPrefs(registry); | 248 chromeos::LoginUtils::RegisterPrefs(registry); |
248 chromeos::Preferences::RegisterPrefs(registry); | 249 chromeos::Preferences::RegisterPrefs(registry); |
249 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); | 250 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); |
250 chromeos::RegisterDisplayLocalStatePrefs(registry); | 251 chromeos::RegisterDisplayLocalStatePrefs(registry); |
251 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); | 252 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 } | 443 } |
443 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 444 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
444 | 445 |
445 current_version |= GOOGLE_URL_TRACKER_PREFS; | 446 current_version |= GOOGLE_URL_TRACKER_PREFS; |
446 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 447 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
447 current_version); | 448 current_version); |
448 } | 449 } |
449 } | 450 } |
450 | 451 |
451 } // namespace chrome | 452 } // namespace chrome |
OLD | NEW |