ash: Use session_manager::SessionState

ash/common/shelf/shelf_layout_manager.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/common/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 950 matching lines @@
 
 void ShelfLayoutManager::OnLockStateEvent(LockStateObserver::EventType event) {
   if (event == EVENT_LOCK_ANIMATION_STARTED) {
     // Enter the screen locked state and update the visibility to avoid an odd
     // animation when transitioning the orientation from L/R to bottom.
     state_.is_screen_locked = true;
     UpdateShelfVisibilityAfterLoginUIChange();
   }
 }
 
-void ShelfLayoutManager::SessionStateChanged(
-    SessionStateDelegate::SessionState state) {
+void ShelfLayoutManager::SessionStateChanged(SessionState state) {
   // Check transition changes to/from the add user to session and change the
   // shelf alignment accordingly
-  bool add_user = state == SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY;
+  const bool add_user = state == SessionState::LOGIN_SECONDARY;
   if (add_user != state_.is_adding_user_screen) {
     state_.is_adding_user_screen = add_user;
     UpdateShelfVisibilityAfterLoginUIChange();
     return;
   }
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
   UpdateBoundsAndOpacity(target_bounds, true /* animate */,
                          true /* change_work_area */, NULL);
   UpdateVisibilityState();
@@ skipping 116 matching lines @@
   gesture_drag_status_ = GESTURE_DRAG_NONE;
 }
 
 void ShelfLayoutManager::CancelGestureDrag() {
   gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS;
   UpdateVisibilityState();
   gesture_drag_status_ = GESTURE_DRAG_NONE;
 }
 
 }  // namespace ash