summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 15:09:06 +0000
committerantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 15:09:06 +0000
commitaa8328fb543ae6ce61522735586cfdd3349a49b4 (patch)
treefc166aa0c4515cba3663af5c4d64de44df5a6f6a /chrome/browser/prefs
parent6f54b9b29087aad960be16e0c7060d73398ae001 (diff)
downloadchromium_src-aa8328fb543ae6ce61522735586cfdd3349a49b4.zip
chromium_src-aa8328fb543ae6ce61522735586cfdd3349a49b4.tar.gz
chromium_src-aa8328fb543ae6ce61522735586cfdd3349a49b4.tar.bz2
Move part of WizardController static code to StartupUtils
BUG=231331 TBR=ben@chromium.org Review URL: https://codereview.chromium.org/14362031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 47a67b7..37fdcef 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -121,10 +121,10 @@
#include "chrome/browser/chromeos/display/display_preferences.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user_image_manager.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/wallpaper_manager.h"
-#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
#include "chrome/browser/chromeos/policy/device_status_collector.h"
@@ -255,7 +255,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
chromeos::UserImageManager::RegisterPrefs(registry);
chromeos::UserManager::RegisterPrefs(registry);
chromeos::WallpaperManager::RegisterPrefs(registry);
- chromeos::WizardController::RegisterPrefs(registry);
+ chromeos::StartupUtils::RegisterPrefs(registry);
policy::AutoEnrollmentClient::RegisterPrefs(registry);
policy::DeviceStatusCollector::RegisterPrefs(registry);
#endif