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

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

Issue 408013003: Move device requisition to EnterpriseEnrollmentHandlerChromeOS. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 154 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
155 #include "chrome/browser/chromeos/login/startup_utils.h" 155 #include "chrome/browser/chromeos/login/startup_utils.h"
156 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 156 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
157 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 157 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
158 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 158 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
159 #include "chrome/browser/chromeos/login/users/user_manager.h" 159 #include "chrome/browser/chromeos/login/users/user_manager.h"
160 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 160 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
161 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 161 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
162 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 162 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
163 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 163 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
164 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
165 #include "chrome/browser/chromeos/policy/device_status_collector.h" 164 #include "chrome/browser/chromeos/policy/device_status_collector.h"
165 #include "chrome/browser/chromeos/policy/enrollment_handler_chromeos.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"
169 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 169 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
170 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 170 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
171 #include "chrome/browser/chromeos/status/data_promo_notification.h" 171 #include "chrome/browser/chromeos/status/data_promo_notification.h"
172 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 172 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
173 #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"
174 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 174 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
175 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 175 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 317 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
318 chromeos::UserImageManager::RegisterPrefs(registry); 318 chromeos::UserImageManager::RegisterPrefs(registry);
319 chromeos::UserManager::RegisterPrefs(registry); 319 chromeos::UserManager::RegisterPrefs(registry);
320 chromeos::UserSessionManager::RegisterPrefs(registry); 320 chromeos::UserSessionManager::RegisterPrefs(registry);
321 chromeos::WallpaperManager::RegisterPrefs(registry); 321 chromeos::WallpaperManager::RegisterPrefs(registry);
322 chromeos::echo_offer::RegisterPrefs(registry); 322 chromeos::echo_offer::RegisterPrefs(registry);
323 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry); 323 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
324 invalidation::InvalidatorStorage::RegisterPrefs(registry); 324 invalidation::InvalidatorStorage::RegisterPrefs(registry);
325 policy::AutoEnrollmentClient::RegisterPrefs(registry); 325 policy::AutoEnrollmentClient::RegisterPrefs(registry);
326 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 326 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
327 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 327 policy::EnrollmentHandlerChromeOS::RegisterPrefs(registry);
328 policy::DeviceStatusCollector::RegisterPrefs(registry); 328 policy::DeviceStatusCollector::RegisterPrefs(registry);
329 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 329 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
330 #endif 330 #endif
331 331
332 #if defined(OS_MACOSX) 332 #if defined(OS_MACOSX)
333 confirm_quit::RegisterLocalState(registry); 333 confirm_quit::RegisterLocalState(registry);
334 QuitWithAppsController::RegisterPrefs(registry); 334 QuitWithAppsController::RegisterPrefs(registry);
335 #endif 335 #endif
336 336
337 #if defined(OS_WIN) 337 #if defined(OS_WIN)
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 #if defined(OS_CHROMEOS) 593 #if defined(OS_CHROMEOS)
594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
595 #endif 595 #endif
596 596
597 #if defined(TOOLKIT_VIEWS) 597 #if defined(TOOLKIT_VIEWS)
598 MigrateBrowserTabStripPrefs(local_state); 598 MigrateBrowserTabStripPrefs(local_state);
599 #endif 599 #endif
600 } 600 }
601 601
602 } // namespace chrome 602 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698