Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: ui/events/gestures/gesture_provider_aura.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ 5 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_
6 #define UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ 6 #define UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 17 matching lines...) Expand all
28 public: 28 public:
29 GestureProviderAura(GestureProviderAuraClient* client); 29 GestureProviderAura(GestureProviderAuraClient* client);
30 virtual ~GestureProviderAura(); 30 virtual ~GestureProviderAura();
31 31
32 bool OnTouchEvent(const TouchEvent& event); 32 bool OnTouchEvent(const TouchEvent& event);
33 void OnTouchEventAck(bool event_consumed); 33 void OnTouchEventAck(bool event_consumed);
34 const MotionEventAura& pointer_state() { return pointer_state_; } 34 const MotionEventAura& pointer_state() { return pointer_state_; }
35 ScopedVector<GestureEvent>* GetAndResetPendingGestures(); 35 ScopedVector<GestureEvent>* GetAndResetPendingGestures();
36 36
37 // GestureProviderClient implementation 37 // GestureProviderClient implementation
38 virtual void OnGestureEvent(const GestureEventData& gesture) OVERRIDE; 38 virtual void OnGestureEvent(const GestureEventData& gesture) override;
39 39
40 private: 40 private:
41 bool IsConsideredDoubleTap(const GestureEventData& previous_tap, 41 bool IsConsideredDoubleTap(const GestureEventData& previous_tap,
42 const GestureEventData& current_tap) const; 42 const GestureEventData& current_tap) const;
43 43
44 scoped_ptr<GestureEventData> previous_tap_; 44 scoped_ptr<GestureEventData> previous_tap_;
45 45
46 GestureProviderAuraClient* client_; 46 GestureProviderAuraClient* client_;
47 MotionEventAura pointer_state_; 47 MotionEventAura pointer_state_;
48 FilteredGestureProvider filtered_gesture_provider_; 48 FilteredGestureProvider filtered_gesture_provider_;
49 49
50 ui::LatencyInfo last_touch_event_latency_info_; 50 ui::LatencyInfo last_touch_event_latency_info_;
51 bool handling_event_; 51 bool handling_event_;
52 ScopedVector<GestureEvent> pending_gestures_; 52 ScopedVector<GestureEvent> pending_gestures_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(GestureProviderAura); 54 DISALLOW_COPY_AND_ASSIGN(GestureProviderAura);
55 }; 55 };
56 56
57 } // namespace ui 57 } // namespace ui
58 58
59 #endif // UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_ 59 #endif // UI_EVENTS_GESTURE_DETECTION_UI_GESTURE_PROVIDER_H_
OLDNEW
« no previous file with comments | « ui/events/gesture_detection/velocity_tracker.cc ('k') | ui/events/gestures/gesture_provider_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698