Index: ash/shell/shell_delegate_impl.cc |
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc |
index bb29637e088b4bf24ab8a39e8858da3c27074acc..69dec53ca6c10ff197bb7e4d2ae181d8684fce17 100644 |
--- a/ash/shell/shell_delegate_impl.cc |
+++ b/ash/shell/shell_delegate_impl.cc |
@@ -8,6 +8,8 @@ |
#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" |
@@ -23,7 +25,6 @@ namespace shell { |
ShellDelegateImpl::ShellDelegateImpl() |
: watcher_(NULL), |
launcher_delegate_(NULL), |
- locked_(false), |
spoken_feedback_enabled_(false), |
high_contrast_enabled_(false), |
screen_magnifier_enabled_(false), |
@@ -39,18 +40,6 @@ void ShellDelegateImpl::SetWatcher(WindowWatcher* watcher) { |
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; |
} |
@@ -63,25 +52,6 @@ bool ShellDelegateImpl::IsRunningInForcedAppMode() const { |
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() { |
} |
@@ -198,6 +168,10 @@ ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() { |
return new CapsLockDelegateStub; |
} |
+ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { |
+ return new SessionStateDelegateStub; |
+} |
+ |
aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { |
return NULL; |
} |