chrome/browser/chromeos/login/parallel_authenticator.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/parallel_authenticator.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/ownership_service_unittest.cc ('k') | chrome/browser/chromeos/login/parallel_authenticator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ed49bc3d26bd12946004f78c2906b5096d1b8d6b..ceb6f7d42fc77c776398678ab7ede0481e373ee8 100644

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

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

@@ -15,12 +15,12 @@

#include "chrome/browser/chromeos/cros/cert_library.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/cryptohome/async_method_caller.h"

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

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/net/gaia/gaia_auth_util.h"