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

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

Issue 438493002: Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin
Patch Set: Fixed the broken test. 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
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/multi_profile_user_controller.h" 157 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
158 #include "chrome/browser/chromeos/login/users/user_manager.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/device_cloud_policy_manager_chromeos.h" 164 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
164 #include "chrome/browser/chromeos/policy/device_status_collector.h" 165 #include "chrome/browser/chromeos/policy/device_status_collector.h"
165 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 166 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
166 #include "chrome/browser/chromeos/power/power_prefs.h" 167 #include "chrome/browser/chromeos/power/power_prefs.h"
167 #include "chrome/browser/chromeos/preferences.h" 168 #include "chrome/browser/chromeos/preferences.h"
168 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 169 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
169 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 170 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
170 #include "chrome/browser/chromeos/status/data_promo_notification.h" 171 #include "chrome/browser/chromeos/status/data_promo_notification.h"
171 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 172 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
172 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 173 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 322 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
322 chromeos::UserImageManager::RegisterPrefs(registry); 323 chromeos::UserImageManager::RegisterPrefs(registry);
323 chromeos::UserManager::RegisterPrefs(registry); 324 chromeos::UserManager::RegisterPrefs(registry);
324 chromeos::UserSessionManager::RegisterPrefs(registry); 325 chromeos::UserSessionManager::RegisterPrefs(registry);
325 chromeos::WallpaperManager::RegisterPrefs(registry); 326 chromeos::WallpaperManager::RegisterPrefs(registry);
326 chromeos::echo_offer::RegisterPrefs(registry); 327 chromeos::echo_offer::RegisterPrefs(registry);
327 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 328 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
328 invalidation::InvalidatorStorage::RegisterPrefs(registry); 329 invalidation::InvalidatorStorage::RegisterPrefs(registry);
329 policy::AutoEnrollmentClient::RegisterPrefs(registry); 330 policy::AutoEnrollmentClient::RegisterPrefs(registry);
330 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 331 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
332 policy::ConsumerManagementService::RegisterPrefs(registry);
331 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 333 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
332 policy::DeviceStatusCollector::RegisterPrefs(registry); 334 policy::DeviceStatusCollector::RegisterPrefs(registry);
333 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 335 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
334 #endif 336 #endif
335 337
336 #if defined(OS_MACOSX) 338 #if defined(OS_MACOSX)
337 confirm_quit::RegisterLocalState(registry); 339 confirm_quit::RegisterLocalState(registry);
338 QuitWithAppsController::RegisterPrefs(registry); 340 QuitWithAppsController::RegisterPrefs(registry);
339 #endif 341 #endif
340 342
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 #if defined(OS_CHROMEOS) 608 #if defined(OS_CHROMEOS)
607 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 609 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
608 #endif 610 #endif
609 611
610 #if defined(TOOLKIT_VIEWS) 612 #if defined(TOOLKIT_VIEWS)
611 MigrateBrowserTabStripPrefs(local_state); 613 MigrateBrowserTabStripPrefs(local_state);
612 #endif 614 #endif
613 } 615 }
614 616
615 } // namespace chrome 617 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698