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

Side by Side Diff: content/browser/renderer_host/input/motion_event_android.h

Issue 897783002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 1
2 // Copyright 2014 The Chromium Authors. All rights reserved. 2 // Copyright 2014 The Chromium Authors. All rights reserved.
3 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
4 // found in the LICENSE file. 4 // found in the LICENSE file.
5 5
6 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 6 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
7 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 7 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
8 8
9 #include <jni.h> 9 #include <jni.h>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 jint android_action, 48 jint android_action,
49 jint pointer_count, 49 jint pointer_count,
50 jint history_size, 50 jint history_size,
51 jint action_index, 51 jint action_index,
52 jint android_button_state, 52 jint android_button_state,
53 jint meta_state, 53 jint meta_state,
54 jfloat raw_offset_x_pixels, 54 jfloat raw_offset_x_pixels,
55 jfloat raw_offset_y_pixels, 55 jfloat raw_offset_y_pixels,
56 const Pointer& pointer0, 56 const Pointer& pointer0,
57 const Pointer& pointer1); 57 const Pointer& pointer1);
58 virtual ~MotionEventAndroid(); 58 ~MotionEventAndroid() override;
59 59
60 // ui::MotionEvent methods. 60 // ui::MotionEvent methods.
61 virtual int GetId() const override; 61 int GetId() const override;
62 virtual Action GetAction() const override; 62 Action GetAction() const override;
63 virtual int GetActionIndex() const override; 63 int GetActionIndex() const override;
64 virtual size_t GetPointerCount() const override; 64 size_t GetPointerCount() const override;
65 virtual int GetPointerId(size_t pointer_index) const override; 65 int GetPointerId(size_t pointer_index) const override;
66 virtual float GetX(size_t pointer_index) const override; 66 float GetX(size_t pointer_index) const override;
67 virtual float GetY(size_t pointer_index) const override; 67 float GetY(size_t pointer_index) const override;
68 virtual float GetRawX(size_t pointer_index) const override; 68 float GetRawX(size_t pointer_index) const override;
69 virtual float GetRawY(size_t pointer_index) const override; 69 float GetRawY(size_t pointer_index) const override;
70 virtual float GetTouchMajor(size_t pointer_index) const override; 70 float GetTouchMajor(size_t pointer_index) const override;
71 virtual float GetTouchMinor(size_t pointer_index) const override; 71 float GetTouchMinor(size_t pointer_index) const override;
72 virtual float GetOrientation(size_t pointer_index) const override; 72 float GetOrientation(size_t pointer_index) const override;
73 virtual float GetPressure(size_t pointer_index) const override; 73 float GetPressure(size_t pointer_index) const override;
74 virtual base::TimeTicks GetEventTime() const override; 74 base::TimeTicks GetEventTime() const override;
75 virtual size_t GetHistorySize() const override; 75 size_t GetHistorySize() const override;
76 virtual base::TimeTicks GetHistoricalEventTime( 76 base::TimeTicks GetHistoricalEventTime(
77 size_t historical_index) const override; 77 size_t historical_index) const override;
78 virtual float GetHistoricalTouchMajor(size_t pointer_index, 78 float GetHistoricalTouchMajor(size_t pointer_index,
79 size_t historical_index) const override; 79 size_t historical_index) const override;
80 virtual float GetHistoricalX(size_t pointer_index, 80 float GetHistoricalX(size_t pointer_index,
81 size_t historical_index) const override; 81 size_t historical_index) const override;
82 virtual float GetHistoricalY(size_t pointer_index, 82 float GetHistoricalY(size_t pointer_index,
83 size_t historical_index) const override; 83 size_t historical_index) const override;
84 virtual ToolType GetToolType(size_t pointer_index) const override; 84 ToolType GetToolType(size_t pointer_index) const override;
85 virtual int GetButtonState() const override; 85 int GetButtonState() const override;
86 virtual int GetFlags() const override; 86 int GetFlags() const override;
87 87
88 static bool RegisterMotionEventAndroid(JNIEnv* env); 88 static bool RegisterMotionEventAndroid(JNIEnv* env);
89 89
90 private: 90 private:
91 struct CachedPointer; 91 struct CachedPointer;
92 92
93 float ToDips(float pixels) const; 93 float ToDips(float pixels) const;
94 CachedPointer FromAndroidPointer(const Pointer& pointer) const; 94 CachedPointer FromAndroidPointer(const Pointer& pointer) const;
95 95
96 // Cache pointer coords, id's and major lengths for the most common 96 // Cache pointer coords, id's and major lengths for the most common
(...skipping 25 matching lines...) Expand all
122 float orientation; 122 float orientation;
123 ToolType tool_type; 123 ToolType tool_type;
124 } cached_pointers_[MAX_POINTERS_TO_CACHE]; 124 } cached_pointers_[MAX_POINTERS_TO_CACHE];
125 125
126 DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid); 126 DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid);
127 }; 127 };
128 128
129 } // namespace content 129 } // namespace content
130 130
131 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 131 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698