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

Unified Diff: ash/test/test_session_state_delegate.h

Issue 379803004: Move UserInfo to user_manager. (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
« no previous file with comments | « ash/system/user/user_view.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_session_state_delegate.h
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
index 5616eec9474fb4a867611233655e3727d7bd6832..478c340e80b8eb0ed6921e622dab3c7c699e3256 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -24,7 +24,7 @@ class TestSessionStateDelegate : public SessionStateDelegate {
void set_logged_in_users(int users) { logged_in_users_ = users; }
void AddUser(const std::string user_id);
- const UserInfo* GetActiveUserInfo() const;
+ const user_manager::UserInfo* GetActiveUserInfo() const;
// SessionStateDelegate:
virtual content::BrowserContext* GetBrowserContextByIndex(
@@ -41,9 +41,9 @@ class TestSessionStateDelegate : public SessionStateDelegate {
virtual void UnlockScreen() OVERRIDE;
virtual bool IsUserSessionBlocked() const OVERRIDE;
virtual SessionState GetSessionState() const OVERRIDE;
- virtual const UserInfo* GetUserInfo(
+ virtual const user_manager::UserInfo* GetUserInfo(
ash::MultiProfileIndex index) const OVERRIDE;
- virtual const UserInfo* GetUserInfo(
+ virtual const user_manager::UserInfo* GetUserInfo(
content::BrowserContext* context) const OVERRIDE;
virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
« no previous file with comments | « ash/system/user/user_view.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698