diff options
Diffstat (limited to 'chrome/browser/ui/ash/chrome_shell_delegate.cc')
| -rw-r--r-- | chrome/browser/ui/ash/chrome_shell_delegate.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index 2ecb35a..1fd4f9a 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -8,6 +8,7 @@ #include "ash/host/root_window_host_factory.h" #include "ash/launcher/launcher_types.h" #include "ash/magnifier/magnifier_constants.h" +#include "ash/session_state_delegate.h" #include "ash/shelf/shelf_widget.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/window_properties.h" @@ -26,6 +27,7 @@ #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" +#include "chrome/browser/ui/ash/session_state_delegate.h" #include "chrome/browser/ui/ash/user_action_handler.h" #include "chrome/browser/ui/ash/window_positioner.h" #include "chrome/browser/ui/browser.h" @@ -79,11 +81,6 @@ bool ChromeShellDelegate::IsRunningInForcedAppMode() const { return chrome::IsRunningInForcedAppMode(); } -void ChromeShellDelegate::UnlockScreen() { - // This is used only for testing thus far. - NOTIMPLEMENTED(); -} - void ChromeShellDelegate::Exit() { chrome::AttemptUserExit(); } @@ -198,6 +195,10 @@ ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate( return launcher_delegate_; } +ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { + return new SessionStateDelegate; +} + aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() { return new UserActionHandler; } |