| Index: trunk/src/ash/shell/shell_delegate_impl.cc | 
| =================================================================== | 
| --- trunk/src/ash/shell/shell_delegate_impl.cc	(revision 194588) | 
| +++ trunk/src/ash/shell/shell_delegate_impl.cc	(working copy) | 
| @@ -8,8 +8,6 @@ | 
|  | 
| #include "ash/caps_lock_delegate_stub.h" | 
| #include "ash/host/root_window_host_factory.h" | 
| -#include "ash/session_state_delegate.h" | 
| -#include "ash/session_state_delegate_stub.h" | 
| #include "ash/shell/context_menu.h" | 
| #include "ash/shell/example_factory.h" | 
| #include "ash/shell/launcher_delegate_impl.h" | 
| @@ -25,6 +23,7 @@ | 
| ShellDelegateImpl::ShellDelegateImpl() | 
| : watcher_(NULL), | 
| launcher_delegate_(NULL), | 
| +      locked_(false), | 
| spoken_feedback_enabled_(false), | 
| high_contrast_enabled_(false), | 
| screen_magnifier_enabled_(false), | 
| @@ -40,6 +39,18 @@ | 
| launcher_delegate_->set_watcher(watcher); | 
| } | 
|  | 
| +bool ShellDelegateImpl::IsUserLoggedIn() const { | 
| +  return true; | 
| +} | 
| + | 
| +bool ShellDelegateImpl::IsSessionStarted() const { | 
| +  return true; | 
| +} | 
| + | 
| +bool ShellDelegateImpl::IsGuestSession() const { | 
| +  return false; | 
| +} | 
| + | 
| bool ShellDelegateImpl::IsFirstRunAfterBoot() const { | 
| return false; | 
| } | 
| @@ -52,6 +63,25 @@ | 
| return false; | 
| } | 
|  | 
| +bool ShellDelegateImpl::CanLockScreen() const { | 
| +  return true; | 
| +} | 
| + | 
| +void ShellDelegateImpl::LockScreen() { | 
| +  ash::shell::CreateLockScreen(); | 
| +  locked_ = true; | 
| +  ash::Shell::GetInstance()->UpdateShelfVisibility(); | 
| +} | 
| + | 
| +void ShellDelegateImpl::UnlockScreen() { | 
| +  locked_ = false; | 
| +  ash::Shell::GetInstance()->UpdateShelfVisibility(); | 
| +} | 
| + | 
| +bool ShellDelegateImpl::IsScreenLocked() const { | 
| +  return locked_; | 
| +} | 
| + | 
| void ShellDelegateImpl::PreInit() { | 
| } | 
|  | 
| @@ -168,10 +198,6 @@ | 
| return new CapsLockDelegateStub; | 
| } | 
|  | 
| -ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { | 
| -  return new SessionStateDelegateStub; | 
| -} | 
| - | 
| aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { | 
| return NULL; | 
| } | 
|  |