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

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

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #include "chrome/browser/chromeos/display/display_preferences.h" 147 #include "chrome/browser/chromeos/display/display_preferences.h"
148 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 148 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
149 #include "chrome/browser/chromeos/file_system_provider/service.h" 149 #include "chrome/browser/chromeos/file_system_provider/service.h"
150 #include "chrome/browser/chromeos/first_run/first_run.h" 150 #include "chrome/browser/chromeos/first_run/first_run.h"
151 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" 151 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
152 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 152 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
153 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 153 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
154 #include "chrome/browser/chromeos/login/startup_utils.h" 154 #include "chrome/browser/chromeos/login/startup_utils.h"
155 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 155 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
156 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 156 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
157 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
157 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 158 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
158 #include "chrome/browser/chromeos/login/users/user_manager.h"
159 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 159 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
160 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 160 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
161 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 161 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
162 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 162 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
163 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 163 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
164 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 164 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
165 #include "chrome/browser/chromeos/policy/device_status_collector.h" 165 #include "chrome/browser/chromeos/policy/device_status_collector.h"
166 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 166 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
167 #include "chrome/browser/chromeos/power/power_prefs.h" 167 #include "chrome/browser/chromeos/power/power_prefs.h"
168 #include "chrome/browser/chromeos/preferences.h" 168 #include "chrome/browser/chromeos/preferences.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 RegisterBrowserPrefs(registry); 296 RegisterBrowserPrefs(registry);
297 #if !defined(OS_CHROMEOS) 297 #if !defined(OS_CHROMEOS)
298 RegisterDefaultBrowserPromptPrefs(registry); 298 RegisterDefaultBrowserPromptPrefs(registry);
299 #endif // !defined(OS_CHROMEOS) 299 #endif // !defined(OS_CHROMEOS)
300 #endif // !defined(OS_ANDROID) 300 #endif // !defined(OS_ANDROID)
301 301
302 #if defined(OS_CHROMEOS) 302 #if defined(OS_CHROMEOS)
303 ChromeOSMetricsProvider::RegisterPrefs(registry); 303 ChromeOSMetricsProvider::RegisterPrefs(registry);
304 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 304 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
305 chromeos::ChargerReplacementHandler::RegisterPrefs(registry); 305 chromeos::ChargerReplacementHandler::RegisterPrefs(registry);
306 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
306 chromeos::DataPromoNotification::RegisterPrefs(registry); 307 chromeos::DataPromoNotification::RegisterPrefs(registry);
307 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 308 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
308 chromeos::device_settings_cache::RegisterPrefs(registry); 309 chromeos::device_settings_cache::RegisterPrefs(registry);
309 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 310 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
310 chromeos::language_prefs::RegisterPrefs(registry); 311 chromeos::language_prefs::RegisterPrefs(registry);
311 chromeos::KioskAppManager::RegisterPrefs(registry); 312 chromeos::KioskAppManager::RegisterPrefs(registry);
312 chromeos::MultiProfileUserController::RegisterPrefs(registry); 313 chromeos::MultiProfileUserController::RegisterPrefs(registry);
313 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry); 314 chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);
314 chromeos::DemoModeDetector::RegisterPrefs(registry); 315 chromeos::DemoModeDetector::RegisterPrefs(registry);
315 chromeos::Preferences::RegisterPrefs(registry); 316 chromeos::Preferences::RegisterPrefs(registry);
316 chromeos::proxy_config::RegisterPrefs(registry); 317 chromeos::proxy_config::RegisterPrefs(registry);
317 chromeos::RegisterDisplayLocalStatePrefs(registry); 318 chromeos::RegisterDisplayLocalStatePrefs(registry);
318 chromeos::ResetScreenHandler::RegisterPrefs(registry); 319 chromeos::ResetScreenHandler::RegisterPrefs(registry);
319 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 320 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
320 chromeos::SigninScreenHandler::RegisterPrefs(registry); 321 chromeos::SigninScreenHandler::RegisterPrefs(registry);
321 chromeos::StartupUtils::RegisterPrefs(registry); 322 chromeos::StartupUtils::RegisterPrefs(registry);
322 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 323 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
323 chromeos::UserImageManager::RegisterPrefs(registry); 324 chromeos::UserImageManager::RegisterPrefs(registry);
324 chromeos::UserManager::RegisterPrefs(registry);
325 chromeos::UserSessionManager::RegisterPrefs(registry); 325 chromeos::UserSessionManager::RegisterPrefs(registry);
326 chromeos::WallpaperManager::RegisterPrefs(registry); 326 chromeos::WallpaperManager::RegisterPrefs(registry);
327 chromeos::echo_offer::RegisterPrefs(registry); 327 chromeos::echo_offer::RegisterPrefs(registry);
328 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 328 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
329 invalidation::InvalidatorStorage::RegisterPrefs(registry); 329 invalidation::InvalidatorStorage::RegisterPrefs(registry);
330 policy::AutoEnrollmentClient::RegisterPrefs(registry); 330 policy::AutoEnrollmentClient::RegisterPrefs(registry);
331 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 331 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
332 policy::ConsumerManagementService::RegisterPrefs(registry); 332 policy::ConsumerManagementService::RegisterPrefs(registry);
333 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 333 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
334 policy::DeviceStatusCollector::RegisterPrefs(registry); 334 policy::DeviceStatusCollector::RegisterPrefs(registry);
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 #if defined(OS_CHROMEOS) 612 #if defined(OS_CHROMEOS)
613 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 613 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
614 #endif 614 #endif
615 615
616 #if defined(TOOLKIT_VIEWS) 616 #if defined(TOOLKIT_VIEWS)
617 MigrateBrowserTabStripPrefs(local_state); 617 MigrateBrowserTabStripPrefs(local_state);
618 #endif 618 #endif
619 } 619 }
620 620
621 } // namespace chrome 621 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/schema_registry_service_factory.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698