chrome/browser/prefs/browser_prefs.cc - Issue 14362031: Move part of WizardController static code to StartupUtils

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fighting with whitespaces again Created 7 years, 8 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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 47a67b755b7e3cf036f2eb2b654c3746f75bb599..37fdcef64f675d134a3aa565241b24703869840f 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