Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 318853004: Introduce SessionManager that will contain code to start user session on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #if defined(OS_CHROMEOS) 137 #if defined(OS_CHROMEOS)
138 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 138 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
139 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 139 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
140 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" 140 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
141 #include "chrome/browser/chromeos/customization_document.h" 141 #include "chrome/browser/chromeos/customization_document.h"
142 #include "chrome/browser/chromeos/display/display_preferences.h" 142 #include "chrome/browser/chromeos/display/display_preferences.h"
143 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 143 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
144 #include "chrome/browser/chromeos/file_system_provider/service.h" 144 #include "chrome/browser/chromeos/file_system_provider/service.h"
145 #include "chrome/browser/chromeos/first_run/first_run.h" 145 #include "chrome/browser/chromeos/first_run/first_run.h"
146 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" 146 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
147 #include "chrome/browser/chromeos/login/login_utils.h"
148 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 147 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
148 #include "chrome/browser/chromeos/login/session/session_manager.h"
149 #include "chrome/browser/chromeos/login/startup_utils.h" 149 #include "chrome/browser/chromeos/login/startup_utils.h"
150 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 150 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
151 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 151 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
152 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 152 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
153 #include "chrome/browser/chromeos/login/users/user_manager.h" 153 #include "chrome/browser/chromeos/login/users/user_manager.h"
154 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 154 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
155 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 155 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
156 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 156 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
157 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 157 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
158 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 158 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
159 #include "chrome/browser/chromeos/policy/device_status_collector.h" 159 #include "chrome/browser/chromeos/policy/device_status_collector.h"
160 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 160 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
161 #include "chrome/browser/chromeos/power/power_prefs.h" 161 #include "chrome/browser/chromeos/power/power_prefs.h"
162 #include "chrome/browser/chromeos/preferences.h" 162 #include "chrome/browser/chromeos/preferences.h"
163 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 163 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
164 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 164 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
165 #include "chrome/browser/chromeos/status/data_promo_notification.h" 165 #include "chrome/browser/chromeos/status/data_promo_notification.h"
166 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 166 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
167 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 167 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
168 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 168 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
169 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 169 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
170 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 170 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
171 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 171 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
172 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 172 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
173 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
173 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 174 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
174 #else 175 #else
175 #include "chrome/browser/extensions/default_apps.h" 176 #include "chrome/browser/extensions/default_apps.h"
176 #endif 177 #endif
177 178
178 #if defined(OS_MACOSX) 179 #if defined(OS_MACOSX)
179 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 180 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
180 #include "chrome/browser/ui/cocoa/confirm_quit.h" 181 #include "chrome/browser/ui/cocoa/confirm_quit.h"
181 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" 182 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h"
182 #endif 183 #endif
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 #if defined(OS_CHROMEOS) 290 #if defined(OS_CHROMEOS)
290 ChromeOSMetricsProvider::RegisterPrefs(registry); 291 ChromeOSMetricsProvider::RegisterPrefs(registry);
291 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 292 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
292 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 293 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
293 chromeos::DataPromoNotification::RegisterPrefs(registry); 294 chromeos::DataPromoNotification::RegisterPrefs(registry);
294 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 295 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
295 chromeos::device_settings_cache::RegisterPrefs(registry); 296 chromeos::device_settings_cache::RegisterPrefs(registry);
296 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 297 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
297 chromeos::language_prefs::RegisterPrefs(registry); 298 chromeos::language_prefs::RegisterPrefs(registry);
298 chromeos::KioskAppManager::RegisterPrefs(registry); 299 chromeos::KioskAppManager::RegisterPrefs(registry);
299 chromeos::LoginUtils::RegisterPrefs(registry); 300 chromeos::SessionManager::RegisterPrefs(registry);
Bernhard Bauer 2014/06/11 15:17:09 Move this down so it will stay sorted?
300 chromeos::MultiProfileUserController::RegisterPrefs(registry); 301 chromeos::MultiProfileUserController::RegisterPrefs(registry);
301 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 302 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
302 chromeos::NetworkScreenHandler::RegisterPrefs(registry); 303 chromeos::NetworkScreenHandler::RegisterPrefs(registry);
303 chromeos::Preferences::RegisterPrefs(registry); 304 chromeos::Preferences::RegisterPrefs(registry);
304 chromeos::proxy_config::RegisterPrefs(registry); 305 chromeos::proxy_config::RegisterPrefs(registry);
305 chromeos::RegisterDisplayLocalStatePrefs(registry); 306 chromeos::RegisterDisplayLocalStatePrefs(registry);
307 chromeos::ResetScreenHandler::RegisterPrefs(registry);
306 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 308 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
307 chromeos::SigninScreenHandler::RegisterPrefs(registry); 309 chromeos::SigninScreenHandler::RegisterPrefs(registry);
308 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 310 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
309 chromeos::UserImageManager::RegisterPrefs(registry); 311 chromeos::UserImageManager::RegisterPrefs(registry);
310 chromeos::UserManager::RegisterPrefs(registry); 312 chromeos::UserManager::RegisterPrefs(registry);
311 chromeos::WallpaperManager::RegisterPrefs(registry); 313 chromeos::WallpaperManager::RegisterPrefs(registry);
312 chromeos::StartupUtils::RegisterPrefs(registry); 314 chromeos::StartupUtils::RegisterPrefs(registry);
313 chromeos::echo_offer::RegisterPrefs(registry); 315 chromeos::echo_offer::RegisterPrefs(registry);
314 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 316 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
315 policy::AutoEnrollmentClient::RegisterPrefs(registry); 317 policy::AutoEnrollmentClient::RegisterPrefs(registry);
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 #if defined(OS_CHROMEOS) 591 #if defined(OS_CHROMEOS)
590 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
591 #endif 593 #endif
592 594
593 #if defined(TOOLKIT_VIEWS) 595 #if defined(TOOLKIT_VIEWS)
594 MigrateBrowserTabStripPrefs(local_state); 596 MigrateBrowserTabStripPrefs(local_state);
595 #endif 597 #endif
596 } 598 }
597 599
598 } // namespace chrome 600 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698