chrome/browser/chromeos/login/user_manager_impl.cc - Issue 10878061: chromeos: Move src/chrome/browser/chromeos/cryptohome to src/chromeos

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 10878061: chromeos: Move src/chrome/browser/chromeos/cryptohome to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 4 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/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 7a0301e7846614840f5b5755ce1b09b8501abc9b..4f765e685fd78e58c62e6128f9c578ab09d19cd7 100644

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

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

@@ -26,7 +26,6 @@

#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/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"

@@ -49,6 +48,7 @@

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/pref_names.h"

+#include "chromeos/cryptohome/async_method_caller.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "content/public/common/url_constants.h"