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

Side by Side Diff: ui/events/gesture_detection/motion_event_generic.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_MOTION_EVENT_GENERIC_H_ 5 #ifndef UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_
6 #define UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_ 6 #define UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/containers/stack_container.h" 9 #include "base/containers/stack_container.h"
10 #include "ui/events/gesture_detection/gesture_detection_export.h" 10 #include "ui/events/gesture_detection/gesture_detection_export.h"
(...skipping 21 matching lines...) Expand all
32 class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent { 32 class GESTURE_DETECTION_EXPORT MotionEventGeneric : public MotionEvent {
33 public: 33 public:
34 MotionEventGeneric(Action action, 34 MotionEventGeneric(Action action,
35 base::TimeTicks event_time, 35 base::TimeTicks event_time,
36 const PointerProperties& pointer); 36 const PointerProperties& pointer);
37 MotionEventGeneric(const MotionEventGeneric& other); 37 MotionEventGeneric(const MotionEventGeneric& other);
38 38
39 virtual ~MotionEventGeneric(); 39 virtual ~MotionEventGeneric();
40 40
41 // MotionEvent implementation. 41 // MotionEvent implementation.
42 virtual int GetId() const OVERRIDE; 42 virtual int GetId() const override;
43 virtual Action GetAction() const OVERRIDE; 43 virtual Action GetAction() const override;
44 virtual int GetActionIndex() const OVERRIDE; 44 virtual int GetActionIndex() const override;
45 virtual size_t GetPointerCount() const OVERRIDE; 45 virtual size_t GetPointerCount() const override;
46 virtual int GetPointerId(size_t pointer_index) const OVERRIDE; 46 virtual int GetPointerId(size_t pointer_index) const override;
47 virtual float GetX(size_t pointer_index) const OVERRIDE; 47 virtual float GetX(size_t pointer_index) const override;
48 virtual float GetY(size_t pointer_index) const OVERRIDE; 48 virtual float GetY(size_t pointer_index) const override;
49 virtual float GetRawX(size_t pointer_index) const OVERRIDE; 49 virtual float GetRawX(size_t pointer_index) const override;
50 virtual float GetRawY(size_t pointer_index) const OVERRIDE; 50 virtual float GetRawY(size_t pointer_index) const override;
51 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; 51 virtual float GetTouchMajor(size_t pointer_index) const override;
52 virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE; 52 virtual float GetTouchMinor(size_t pointer_index) const override;
53 virtual float GetOrientation(size_t pointer_index) const OVERRIDE; 53 virtual float GetOrientation(size_t pointer_index) const override;
54 virtual float GetPressure(size_t pointer_index) const OVERRIDE; 54 virtual float GetPressure(size_t pointer_index) const override;
55 virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE; 55 virtual ToolType GetToolType(size_t pointer_index) const override;
56 virtual int GetButtonState() const OVERRIDE; 56 virtual int GetButtonState() const override;
57 virtual int GetFlags() const OVERRIDE; 57 virtual int GetFlags() const override;
58 virtual base::TimeTicks GetEventTime() const OVERRIDE; 58 virtual base::TimeTicks GetEventTime() const override;
59 virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE; 59 virtual scoped_ptr<MotionEvent> Clone() const override;
60 virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE; 60 virtual scoped_ptr<MotionEvent> Cancel() const override;
61 61
62 void PushPointer(const PointerProperties& pointer); 62 void PushPointer(const PointerProperties& pointer);
63 63
64 void set_action(Action action) { action_ = action; } 64 void set_action(Action action) { action_ = action; }
65 void set_event_time(base::TimeTicks event_time) { event_time_ = event_time; } 65 void set_event_time(base::TimeTicks event_time) { event_time_ = event_time; }
66 void set_id(int id) { id_ = id; } 66 void set_id(int id) { id_ = id; }
67 void set_action_index(int action_index) { action_index_ = action_index; } 67 void set_action_index(int action_index) { action_index_ = action_index; }
68 void set_button_state(int button_state) { button_state_ = button_state; } 68 void set_button_state(int button_state) { button_state_ = button_state; }
69 void set_flags(int flags) { flags_ = flags; } 69 void set_flags(int flags) { flags_ = flags; }
70 70
(...skipping 15 matching lines...) Expand all
86 int id_; 86 int id_;
87 int action_index_; 87 int action_index_;
88 int button_state_; 88 int button_state_;
89 int flags_; 89 int flags_;
90 base::StackVector<PointerProperties, kTypicalMaxPointerCount> pointers_; 90 base::StackVector<PointerProperties, kTypicalMaxPointerCount> pointers_;
91 }; 91 };
92 92
93 } // namespace ui 93 } // namespace ui
94 94
95 #endif // UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_ 95 #endif // UI_EVENTS_GESTURE_DETECTION_UI_MOTION_EVENT_GENERIC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698