chrome/browser/chromeos/login/user_manager_impl.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/user_manager_impl.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

« no previous file with comments | « chrome/browser/chromeos/login/signed_settings_unittest.cc ('k') | chrome/browser/chromeos/login/user_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6257ebbcd1fd317850d4ca0f8b28fb9eea55d85f..2cdd827c95c3318099e7bf118acb85cbf151108d 100644

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

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

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

#include <vector>

-#include "ash/shell.h"

#include "ash/desktop_background/desktop_background_controller.h"

+#include "ash/shell.h"

#include "base/bind.h"

#include "base/chromeos/chromeos_version.h"

#include "base/command_line.h"

@@ -28,16 +28,16 @@

#include "chrome/browser/browser_process.h"

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

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

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

#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

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

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

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

-#include "chrome/browser/chromeos/login/ownership_service.h"

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

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

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

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

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

#include "chrome/browser/policy/browser_policy_connector.h"

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

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