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/wm/gestures/shelf_gesture_handler.h" | 5 #include "ash/wm/gestures/shelf_gesture_handler.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/session_state_delegate.h" | 8 #include "ash/session_state_delegate.h" |
9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
10 #include "ash/shelf/shelf_types.h" | 10 #include "ash/shelf/shelf_types.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 shell->session_state_delegate()->IsScreenLocked()) { | 36 shell->session_state_delegate()->IsScreenLocked()) { |
37 // The gestures are disabled in the lock/login screen. | 37 // The gestures are disabled in the lock/login screen. |
38 return false; | 38 return false; |
39 } | 39 } |
40 | 40 |
41 // TODO(oshima): Find the root window controller from event's location. | 41 // TODO(oshima): Find the root window controller from event's location. |
42 RootWindowController* controller = Shell::GetPrimaryRootWindowController(); | 42 RootWindowController* controller = Shell::GetPrimaryRootWindowController(); |
43 | 43 |
44 ShelfLayoutManager* shelf = controller->GetShelfLayoutManager(); | 44 ShelfLayoutManager* shelf = controller->GetShelfLayoutManager(); |
45 | 45 |
46 const aura::Window* fullscreen = controller->GetTopmostFullscreenWindow(); | 46 const aura::Window* fullscreen = controller->GetWindowForFullscreenMode(); |
47 if (fullscreen && | 47 if (fullscreen && |
48 ash::wm::GetWindowState(fullscreen)->hide_shelf_when_fullscreen()) { | 48 ash::wm::GetWindowState(fullscreen)->hide_shelf_when_fullscreen()) { |
49 return false; | 49 return false; |
50 } | 50 } |
51 | 51 |
52 if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) { | 52 if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) { |
53 drag_in_progress_ = true; | 53 drag_in_progress_ = true; |
54 shelf->StartGestureDrag(event); | 54 shelf->StartGestureDrag(event); |
55 return true; | 55 return true; |
56 } | 56 } |
(...skipping 26 matching lines...) Expand all Loading... |
83 return true; | 83 return true; |
84 } | 84 } |
85 | 85 |
86 // Unexpected event. Reset the state and let the event fall through. | 86 // Unexpected event. Reset the state and let the event fall through. |
87 shelf->CancelGestureDrag(); | 87 shelf->CancelGestureDrag(); |
88 return false; | 88 return false; |
89 } | 89 } |
90 | 90 |
91 } // namespace internal | 91 } // namespace internal |
92 } // namespace ash | 92 } // namespace ash |
OLD | NEW |