| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/common/shelf/shelf_layout_manager.h" | 5 #include "ash/common/shelf/shelf_layout_manager.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <cmath> | 8 #include <cmath> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| 11 #include "ash/animation/animation_change_type.h" | 11 #include "ash/animation/animation_change_type.h" | 
| 12 #include "ash/common/session/session_controller.h" | 12 #include "ash/common/session/session_controller.h" | 
| 13 #include "ash/common/session/session_state_delegate.h" | 13 #include "ash/common/session/session_state_delegate.h" | 
| 14 #include "ash/common/shelf/shelf_constants.h" | 14 #include "ash/common/shelf/shelf_constants.h" | 
| 15 #include "ash/common/shelf/shelf_layout_manager_observer.h" | 15 #include "ash/common/shelf/shelf_layout_manager_observer.h" | 
| 16 #include "ash/common/shelf/shelf_widget.h" | 16 #include "ash/common/shelf/shelf_widget.h" | 
| 17 #include "ash/common/shelf/wm_shelf.h" | 17 #include "ash/common/shelf/wm_shelf.h" | 
| 18 #include "ash/common/system/status_area_widget.h" |  | 
| 19 #include "ash/common/wm/fullscreen_window_finder.h" | 18 #include "ash/common/wm/fullscreen_window_finder.h" | 
| 20 #include "ash/common/wm/mru_window_tracker.h" | 19 #include "ash/common/wm/mru_window_tracker.h" | 
| 21 #include "ash/common/wm/window_state.h" | 20 #include "ash/common/wm/window_state.h" | 
| 22 #include "ash/common/wm/wm_screen_util.h" | 21 #include "ash/common/wm/wm_screen_util.h" | 
| 23 #include "ash/common/wm_shell.h" | 22 #include "ash/common/wm_shell.h" | 
| 24 #include "ash/common/wm_window.h" | 23 #include "ash/common/wm_window.h" | 
| 25 #include "ash/public/cpp/shell_window_ids.h" | 24 #include "ash/public/cpp/shell_window_ids.h" | 
| 26 #include "ash/root_window_controller.h" | 25 #include "ash/root_window_controller.h" | 
|  | 26 #include "ash/system/status_area_widget.h" | 
| 27 #include "base/auto_reset.h" | 27 #include "base/auto_reset.h" | 
| 28 #include "base/command_line.h" | 28 #include "base/command_line.h" | 
| 29 #include "base/i18n/rtl.h" | 29 #include "base/i18n/rtl.h" | 
| 30 #include "ui/base/ui_base_switches.h" | 30 #include "ui/base/ui_base_switches.h" | 
| 31 #include "ui/compositor/layer.h" | 31 #include "ui/compositor/layer.h" | 
| 32 #include "ui/compositor/layer_animation_observer.h" | 32 #include "ui/compositor/layer_animation_observer.h" | 
| 33 #include "ui/compositor/layer_animator.h" | 33 #include "ui/compositor/layer_animator.h" | 
| 34 #include "ui/compositor/scoped_layer_animation_settings.h" | 34 #include "ui/compositor/scoped_layer_animation_settings.h" | 
| 35 #include "ui/display/display.h" | 35 #include "ui/display/display.h" | 
| 36 #include "ui/display/screen.h" | 36 #include "ui/display/screen.h" | 
| (...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1134   gesture_drag_status_ = GESTURE_DRAG_NONE; | 1134   gesture_drag_status_ = GESTURE_DRAG_NONE; | 
| 1135 } | 1135 } | 
| 1136 | 1136 | 
| 1137 void ShelfLayoutManager::CancelGestureDrag() { | 1137 void ShelfLayoutManager::CancelGestureDrag() { | 
| 1138   gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS; | 1138   gesture_drag_status_ = GESTURE_DRAG_CANCEL_IN_PROGRESS; | 
| 1139   UpdateVisibilityState(); | 1139   UpdateVisibilityState(); | 
| 1140   gesture_drag_status_ = GESTURE_DRAG_NONE; | 1140   gesture_drag_status_ = GESTURE_DRAG_NONE; | 
| 1141 } | 1141 } | 
| 1142 | 1142 | 
| 1143 }  // namespace ash | 1143 }  // namespace ash | 
| OLD | NEW | 
|---|