| Index: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc (revision 194588)
|
| +++ trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc (working copy)
|
| @@ -8,7 +8,6 @@
|
| #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"
|
| @@ -27,7 +26,6 @@
|
| #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"
|
| @@ -81,6 +79,11 @@
|
| return chrome::IsRunningInForcedAppMode();
|
| }
|
|
|
| +void ChromeShellDelegate::UnlockScreen() {
|
| + // This is used only for testing thus far.
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| void ChromeShellDelegate::Exit() {
|
| chrome::AttemptUserExit();
|
| }
|
| @@ -195,10 +198,6 @@
|
| return launcher_delegate_;
|
| }
|
|
|
| -ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
|
| - return new SessionStateDelegate;
|
| -}
|
| -
|
| aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
|
| return new UserActionHandler;
|
| }
|
|
|