| Index: content/browser/renderer_host/input/motion_event_android.h
|
| diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h
|
| index 1774356131e47455c92b01eb039f215aef3657aa..95224dc8a80b6b5688ea262041ab93c1b5d38147 100644
|
| --- a/content/browser/renderer_host/input/motion_event_android.h
|
| +++ b/content/browser/renderer_host/input/motion_event_android.h
|
| @@ -52,34 +52,34 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
|
| virtual ~MotionEventAndroid();
|
|
|
| // ui::MotionEvent methods.
|
| - virtual int GetId() const OVERRIDE;
|
| - virtual Action GetAction() const OVERRIDE;
|
| - virtual int GetActionIndex() const OVERRIDE;
|
| - virtual size_t GetPointerCount() const OVERRIDE;
|
| - virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetX(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetY(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetRawX(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetRawY(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetOrientation(size_t pointer_index) const OVERRIDE;
|
| - virtual float GetPressure(size_t pointer_index) const OVERRIDE;
|
| - virtual base::TimeTicks GetEventTime() const OVERRIDE;
|
| - virtual size_t GetHistorySize() const OVERRIDE;
|
| + virtual int GetId() const override;
|
| + virtual Action GetAction() const override;
|
| + virtual int GetActionIndex() const override;
|
| + virtual size_t GetPointerCount() const override;
|
| + virtual int GetPointerId(size_t pointer_index) const override;
|
| + virtual float GetX(size_t pointer_index) const override;
|
| + virtual float GetY(size_t pointer_index) const override;
|
| + virtual float GetRawX(size_t pointer_index) const override;
|
| + virtual float GetRawY(size_t pointer_index) const override;
|
| + virtual float GetTouchMajor(size_t pointer_index) const override;
|
| + virtual float GetTouchMinor(size_t pointer_index) const override;
|
| + virtual float GetOrientation(size_t pointer_index) const override;
|
| + virtual float GetPressure(size_t pointer_index) const override;
|
| + virtual base::TimeTicks GetEventTime() const override;
|
| + virtual size_t GetHistorySize() const override;
|
| virtual base::TimeTicks GetHistoricalEventTime(
|
| - size_t historical_index) const OVERRIDE;
|
| + size_t historical_index) const override;
|
| virtual float GetHistoricalTouchMajor(size_t pointer_index,
|
| - size_t historical_index) const OVERRIDE;
|
| + size_t historical_index) const override;
|
| virtual float GetHistoricalX(size_t pointer_index,
|
| - size_t historical_index) const OVERRIDE;
|
| + size_t historical_index) const override;
|
| virtual float GetHistoricalY(size_t pointer_index,
|
| - size_t historical_index) const OVERRIDE;
|
| - virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE;
|
| - virtual int GetButtonState() const OVERRIDE;
|
| - virtual int GetFlags() const OVERRIDE;
|
| - virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE;
|
| - virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;
|
| + size_t historical_index) const override;
|
| + virtual ToolType GetToolType(size_t pointer_index) const override;
|
| + virtual int GetButtonState() const override;
|
| + virtual int GetFlags() const override;
|
| + virtual scoped_ptr<MotionEvent> Clone() const override;
|
| + virtual scoped_ptr<MotionEvent> Cancel() const override;
|
|
|
| // Additional Android MotionEvent methods.
|
| base::TimeTicks GetDownTime() const;
|
|
|