Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index b370267328b324168c4103887a02b3c2f110fda5..7328b9bc7e28e835932a052da279ee569ddb332b 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -14,9 +14,9 @@
#include "chrome/browser/chromeos/base/locale_util.h"
#include "chrome/browser/chromeos/login/auth/authenticator.h"
#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chromeos/dbus/session_manager_client.h"
#include "chromeos/login/auth/user_context.h"
+#include "components/user_manager/user.h"
#include "net/base/network_change_notifier.h"
class PrefRegistrySimple;
@@ -128,7 +128,7 @@ class UserSessionManager
// Returns true if callback will be called.
bool RespectLocalePreference(
Profile* profile,
- const User* user,
+ const user_manager::User* user,
scoped_ptr<locale_util::SwitchLanguageCallback> callback) const;
void AddSessionStateObserver(UserSessionStateObserver* observer);

Powered by Google App Engine
This is Rietveld 408576698