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_web.h

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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 CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
7 7
8 #include "third_party/WebKit/public/web/WebInputEvent.h" 8 #include "third_party/WebKit/public/web/WebInputEvent.h"
9 #include "ui/events/gesture_detection/motion_event.h" 9 #include "ui/events/gesture_detection/motion_event.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 // Implementation of ui::MotionEvent wrapping a WebTouchEvent. 13 // Implementation of ui::MotionEvent wrapping a WebTouchEvent.
14 class MotionEventWeb : public ui::MotionEvent { 14 class MotionEventWeb : public ui::MotionEvent {
15 public: 15 public:
16 explicit MotionEventWeb(const blink::WebTouchEvent& event); 16 explicit MotionEventWeb(const blink::WebTouchEvent& event);
17 virtual ~MotionEventWeb(); 17 virtual ~MotionEventWeb();
18 18
19 // ui::MotionEvent 19 // ui::MotionEvent
20 virtual int GetId() const OVERRIDE; 20 virtual int GetId() const override;
21 virtual Action GetAction() const OVERRIDE; 21 virtual Action GetAction() const override;
22 virtual int GetActionIndex() const OVERRIDE; 22 virtual int GetActionIndex() const override;
23 virtual size_t GetPointerCount() const OVERRIDE; 23 virtual size_t GetPointerCount() const override;
24 virtual int GetPointerId(size_t pointer_index) const OVERRIDE; 24 virtual int GetPointerId(size_t pointer_index) const override;
25 virtual float GetX(size_t pointer_index) const OVERRIDE; 25 virtual float GetX(size_t pointer_index) const override;
26 virtual float GetY(size_t pointer_index) const OVERRIDE; 26 virtual float GetY(size_t pointer_index) const override;
27 virtual float GetRawX(size_t pointer_index) const OVERRIDE; 27 virtual float GetRawX(size_t pointer_index) const override;
28 virtual float GetRawY(size_t pointer_index) const OVERRIDE; 28 virtual float GetRawY(size_t pointer_index) const override;
29 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; 29 virtual float GetTouchMajor(size_t pointer_index) const override;
30 virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE; 30 virtual float GetTouchMinor(size_t pointer_index) const override;
31 virtual float GetOrientation(size_t pointer_index) const OVERRIDE; 31 virtual float GetOrientation(size_t pointer_index) const override;
32 virtual float GetPressure(size_t pointer_index) const OVERRIDE; 32 virtual float GetPressure(size_t pointer_index) const override;
33 virtual base::TimeTicks GetEventTime() const OVERRIDE; 33 virtual base::TimeTicks GetEventTime() const override;
34 virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE; 34 virtual ToolType GetToolType(size_t pointer_index) const override;
35 virtual int GetButtonState() const OVERRIDE; 35 virtual int GetButtonState() const override;
36 virtual int GetFlags() const OVERRIDE; 36 virtual int GetFlags() const override;
37 virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE; 37 virtual scoped_ptr<MotionEvent> Clone() const override;
38 virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE; 38 virtual scoped_ptr<MotionEvent> Cancel() const override;
39 39
40 private: 40 private:
41 blink::WebTouchEvent event_; 41 blink::WebTouchEvent event_;
42 Action cached_action_; 42 Action cached_action_;
43 int cached_action_index_; 43 int cached_action_index_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(MotionEventWeb); 45 DISALLOW_COPY_AND_ASSIGN(MotionEventWeb);
46 }; 46 };
47 47
48 } // namespace content 48 } // namespace content
49 49
50 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_ 50 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698