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 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ | 5 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ |
6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ | 6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "ash/ash_export.h" | 9 #include "ash/ash_export.h" |
10 #include "ui/aura/client/drag_drop_client.h" | 10 #include "ui/aura/client/drag_drop_client.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 virtual void DragCancel() OVERRIDE; | 55 virtual void DragCancel() OVERRIDE; |
56 virtual bool IsDragDropInProgress() OVERRIDE; | 56 virtual bool IsDragDropInProgress() OVERRIDE; |
57 | 57 |
58 // Overridden from aura::EventFilter: | 58 // Overridden from aura::EventFilter: |
59 virtual bool PreHandleKeyEvent(aura::Window* target, | 59 virtual bool PreHandleKeyEvent(aura::Window* target, |
60 aura::KeyEvent* event) OVERRIDE; | 60 aura::KeyEvent* event) OVERRIDE; |
61 virtual bool PreHandleMouseEvent(aura::Window* target, | 61 virtual bool PreHandleMouseEvent(aura::Window* target, |
62 aura::MouseEvent* event) OVERRIDE; | 62 aura::MouseEvent* event) OVERRIDE; |
63 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, | 63 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, |
64 aura::TouchEvent* event) OVERRIDE; | 64 aura::TouchEvent* event) OVERRIDE; |
| 65 virtual ui::GestureStatus PreHandleGestureEvent( |
| 66 aura::Window* target, |
| 67 aura::GestureEvent* event) OVERRIDE; |
65 | 68 |
66 private: | 69 private: |
67 friend class ash::test::DragDropControllerTest; | 70 friend class ash::test::DragDropControllerTest; |
68 | 71 |
69 // Overridden from ui::LayerAnimationObserver: | 72 // Overridden from ui::LayerAnimationObserver: |
70 virtual void OnLayerAnimationEnded( | 73 virtual void OnLayerAnimationEnded( |
71 const ui::LayerAnimationSequence* sequence) OVERRIDE; | 74 const ui::LayerAnimationSequence* sequence) OVERRIDE; |
72 virtual void OnLayerAnimationAborted( | 75 virtual void OnLayerAnimationAborted( |
73 const ui::LayerAnimationSequence* sequence) OVERRIDE; | 76 const ui::LayerAnimationSequence* sequence) OVERRIDE; |
74 virtual void OnLayerAnimationScheduled( | 77 virtual void OnLayerAnimationScheduled( |
(...skipping 17 matching lines...) Expand all Loading... |
92 // Only be used for tests. | 95 // Only be used for tests. |
93 bool should_block_during_drag_drop_; | 96 bool should_block_during_drag_drop_; |
94 | 97 |
95 DISALLOW_COPY_AND_ASSIGN(DragDropController); | 98 DISALLOW_COPY_AND_ASSIGN(DragDropController); |
96 }; | 99 }; |
97 | 100 |
98 } // namespace internal | 101 } // namespace internal |
99 } // namespace ash | 102 } // namespace ash |
100 | 103 |
101 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ | 104 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ |
OLD | NEW |