Chromium Code Reviews| 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 UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ | 5 #ifndef UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ |
| 6 #define UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ | 6 #define UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ui/aura/gestures/gesture_recognizer.h" | |
|
sky
2012/03/28 20:30:36
Old include order is correct.
| |
| 10 | |
| 9 #include <map> | 11 #include <map> |
| 10 #include <queue> | 12 #include <queue> |
| 11 #include <vector> | 13 #include <vector> |
| 12 | 14 |
| 13 #include "base/memory/linked_ptr.h" | 15 #include "base/memory/linked_ptr.h" |
| 14 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 15 #include "ui/aura/aura_export.h" | 17 #include "ui/aura/aura_export.h" |
| 16 #include "ui/aura/gestures/gesture_recognizer.h" | |
| 17 #include "ui/base/events.h" | 18 #include "ui/base/events.h" |
| 18 #include "ui/gfx/point.h" | 19 #include "ui/gfx/point.h" |
| 19 | 20 |
| 20 namespace aura { | 21 namespace aura { |
| 21 class TouchEvent; | 22 class TouchEvent; |
| 22 class GestureEvent; | 23 class GestureEvent; |
| 23 class GestureSequence; | 24 class GestureSequence; |
| 24 | 25 |
| 25 class AURA_EXPORT GestureRecognizerAura : public GestureRecognizer { | 26 class AURA_EXPORT GestureRecognizerAura : public GestureRecognizer { |
| 26 public: | 27 public: |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 47 std::map<Window*, TouchEventQueue*> event_queue_; | 48 std::map<Window*, TouchEventQueue*> event_queue_; |
| 48 std::map<Window*, GestureSequence*> window_sequence_; | 49 std::map<Window*, GestureSequence*> window_sequence_; |
| 49 RootWindow* root_window_; | 50 RootWindow* root_window_; |
| 50 | 51 |
| 51 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerAura); | 52 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerAura); |
| 52 }; | 53 }; |
| 53 | 54 |
| 54 } // namespace aura | 55 } // namespace aura |
| 55 | 56 |
| 56 #endif // UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ | 57 #endif // UI_AURA_GESTURES_GESTURE_RECOGNIZER_AURA_H_ |
| OLD | NEW |