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

Side by Side Diff: ui/events/ozone/evdev/touch_event_converter_evdev.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_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
6 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 6 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
7 7
8 #include <bitset> 8 #include <bitset>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 15 matching lines...) Expand all
26 MAX_FINGERS = 11 26 MAX_FINGERS = 11
27 }; 27 };
28 TouchEventConverterEvdev(int fd, 28 TouchEventConverterEvdev(int fd,
29 base::FilePath path, 29 base::FilePath path,
30 int id, 30 int id,
31 const EventDeviceInfo& info, 31 const EventDeviceInfo& info,
32 const EventDispatchCallback& dispatch); 32 const EventDispatchCallback& dispatch);
33 virtual ~TouchEventConverterEvdev(); 33 virtual ~TouchEventConverterEvdev();
34 34
35 // EventConverterEvdev: 35 // EventConverterEvdev:
36 virtual bool HasTouchscreen() const OVERRIDE; 36 virtual bool HasTouchscreen() const override;
37 virtual gfx::Size GetTouchscreenSize() const OVERRIDE; 37 virtual gfx::Size GetTouchscreenSize() const override;
38 38
39 private: 39 private:
40 friend class MockTouchEventConverterEvdev; 40 friend class MockTouchEventConverterEvdev;
41 41
42 // Unsafe part of initialization. 42 // Unsafe part of initialization.
43 void Init(const EventDeviceInfo& info); 43 void Init(const EventDeviceInfo& info);
44 44
45 // Overidden from base::MessagePumpLibevent::Watcher. 45 // Overidden from base::MessagePumpLibevent::Watcher.
46 virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; 46 virtual void OnFileCanReadWithoutBlocking(int fd) override;
47 47
48 virtual bool Reinitialize(); 48 virtual bool Reinitialize();
49 49
50 void ProcessInputEvent(const input_event& input); 50 void ProcessInputEvent(const input_event& input);
51 void ProcessAbs(const input_event& input); 51 void ProcessAbs(const input_event& input);
52 void ProcessSyn(const input_event& input); 52 void ProcessSyn(const input_event& input);
53 53
54 void ReportEvents(base::TimeDelta delta); 54 void ReportEvents(base::TimeDelta delta);
55 55
56 // Callback for dispatching events. 56 // Callback for dispatching events.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 // In-progress touch points. 107 // In-progress touch points.
108 InProgressEvents events_[MAX_FINGERS]; 108 InProgressEvents events_[MAX_FINGERS];
109 109
110 DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev); 110 DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
111 }; 111 };
112 112
113 } // namespace ui 113 } // namespace ui
114 114
115 #endif // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_ 115 #endif // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698