| Index: chrome/browser/ui/ash/chrome_shell_delegate.h
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| index bbe922d1fb953407f94cfb7c87eb5d5129fd2128..4158f219b6ba872dda1c3e912ca24c071471457f 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| @@ -47,16 +47,9 @@ class ChromeShellDelegate : public ash::ShellDelegate,
|
| }
|
|
|
| // ash::ShellDelegate overrides;
|
| - virtual bool IsUserLoggedIn() const OVERRIDE;
|
| - virtual bool IsSessionStarted() const OVERRIDE;
|
| - virtual bool IsGuestSession() const OVERRIDE;
|
| virtual bool IsFirstRunAfterBoot() const OVERRIDE;
|
| virtual bool IsMultiProfilesEnabled() const OVERRIDE;
|
| virtual bool IsRunningInForcedAppMode() const OVERRIDE;
|
| - virtual bool CanLockScreen() const OVERRIDE;
|
| - virtual void LockScreen() OVERRIDE;
|
| - virtual void UnlockScreen() OVERRIDE;
|
| - virtual bool IsScreenLocked() const OVERRIDE;
|
| virtual void PreInit() OVERRIDE;
|
| virtual void Shutdown() OVERRIDE;
|
| virtual void Exit() OVERRIDE;
|
| @@ -89,6 +82,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
|
| virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
|
| virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
|
| virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
|
| + virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
|
| virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
|
| virtual void OpenFeedbackPage() OVERRIDE;
|
| virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
|
|
|