Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/wm/gestures/shelf_gesture_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 ShelfGestureHandler::ShelfGestureHandler()
     : drag_in_progress_(false) {
 }
 
 ShelfGestureHandler::~ShelfGestureHandler() {
 }
 
 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;
   }
 
   // The gesture are disabled for fullscreen windows.
   aura::Window* active = wm::GetActiveWindow();
   if (active && wm::IsWindowFullscreen(active))
     return false;
 
   // TODO(oshima): Find the root window controller from event's location.
@@ skipping 33 matching lines @@
     return true;
   }
 
   // Unexpected event. Reset the state and let the event fall through.
   shelf->CancelGestureDrag();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash