chrome/browser/chromeos/login/wizard_controller.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

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/chromeos/login/wizard_controller.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/login/wizard_controller.cc

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc

index 70deb032d6d922bed1ade467e84cd9bccd18624e..8a08f07647f18760a9ad6412a4fc68b99a23a4c2 100644

--- a/chrome/browser/chromeos/login/wizard_controller.cc

+++ b/chrome/browser/chromeos/login/wizard_controller.cc

@@ -22,8 +22,6 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/cryptohome_library.h"

-#include "chrome/browser/chromeos/cros_settings.h"

-#include "chrome/browser/chromeos/cros_settings_names.h"

#include "chrome/browser/chromeos/customization_document.h"

#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"

#include "chrome/browser/chromeos/login/eula_screen.h"

@@ -38,6 +36,8 @@

#include "chrome/browser/chromeos/login/update_screen.h"

#include "chrome/browser/chromeos/login/user_image_screen.h"

#include "chrome/browser/chromeos/login/user_manager.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

+#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/options/options_util.h"

« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »