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

Unified Diff: trunk/src/ash/wm/gestures/shelf_gesture_handler.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
« no previous file with comments | « trunk/src/ash/wm/event_client_impl.cc ('k') | trunk/src/ash/wm/power_button_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/gestures/shelf_gesture_handler.cc
===================================================================
--- trunk/src/ash/wm/gestures/shelf_gesture_handler.cc (revision 194588)
+++ trunk/src/ash/wm/gestures/shelf_gesture_handler.cc (working copy)
@@ -5,11 +5,11 @@
#include "ash/wm/gestures/shelf_gesture_handler.h"
#include "ash/root_window_controller.h"
-#include "ash/session_state_delegate.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_types.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
+#include "ash/shell_delegate.h"
#include "ash/system/status_area_widget.h"
#include "ash/wm/gestures/tray_gesture_handler.h"
#include "ash/wm/window_util.h"
@@ -31,8 +31,8 @@
bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) {
Shell* shell = Shell::GetInstance();
- if (!shell->session_state_delegate()->HasActiveUser() ||
- shell->session_state_delegate()->IsScreenLocked()) {
+ if (!shell->delegate()->IsUserLoggedIn() ||
+ shell->delegate()->IsScreenLocked()) {
// The gestures are disabled in the lock/login screen.
return false;
}
« no previous file with comments | « trunk/src/ash/wm/event_client_impl.cc ('k') | trunk/src/ash/wm/power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698