Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698