diff options
Diffstat (limited to 'chrome/browser/ui/ash/session_state_delegate_chromeos.h')
| -rw-r--r-- | chrome/browser/ui/ash/session_state_delegate_chromeos.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h index 913462b..2b28c0d 100644 --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ -#include "ash/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/observer_list.h" @@ -41,17 +41,11 @@ class SessionStateDelegateChromeos virtual void UnlockScreen() OVERRIDE; virtual bool IsUserSessionBlocked() const OVERRIDE; virtual SessionState GetSessionState() const OVERRIDE; - virtual const base::string16 GetUserDisplayName( + virtual const ash::UserInfo* GetUserInfo( ash::MultiProfileIndex index) const OVERRIDE; - virtual const base::string16 GetUserGivenName( - ash::MultiProfileIndex index) const OVERRIDE; - virtual const std::string GetUserEmail( - ash::MultiProfileIndex index) const OVERRIDE; - virtual const std::string GetUserID( - ash::MultiProfileIndex index) const OVERRIDE; - virtual const gfx::ImageSkia& GetUserImage( + virtual const ash::UserInfo* GetUserInfo( content::BrowserContext* context) const OVERRIDE; - virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE; + virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE; virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE; virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE; virtual void AddSessionStateObserver( |