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

Side by Side Diff: ui/display/chromeos/x11/native_display_event_dispatcher_x11.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_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_ 5 #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_ 6 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
7 7
8 #include "base/time/tick_clock.h" 8 #include "base/time/tick_clock.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "ui/display/chromeos/x11/native_display_delegate_x11.h" 10 #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
11 #include "ui/events/platform/platform_event_dispatcher.h" 11 #include "ui/events/platform/platform_event_dispatcher.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 // The implementation is interested in the cases of RRNotify events which 15 // The implementation is interested in the cases of RRNotify events which
16 // correspond to output add/remove events. Note that Output add/remove events 16 // correspond to output add/remove events. Note that Output add/remove events
17 // are sent in response to our own reconfiguration operations so spurious events 17 // are sent in response to our own reconfiguration operations so spurious events
18 // are common. Spurious events will have no effect. 18 // are common. Spurious events will have no effect.
19 class DISPLAY_EXPORT NativeDisplayEventDispatcherX11 19 class DISPLAY_EXPORT NativeDisplayEventDispatcherX11
20 : public ui::PlatformEventDispatcher { 20 : public ui::PlatformEventDispatcher {
21 public: 21 public:
22 NativeDisplayEventDispatcherX11( 22 NativeDisplayEventDispatcherX11(
23 NativeDisplayDelegateX11::HelperDelegate* delegate, 23 NativeDisplayDelegateX11::HelperDelegate* delegate,
24 int xrandr_event_base); 24 int xrandr_event_base);
25 virtual ~NativeDisplayEventDispatcherX11(); 25 virtual ~NativeDisplayEventDispatcherX11();
26 26
27 // ui::PlatformEventDispatcher: 27 // ui::PlatformEventDispatcher:
28 virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; 28 virtual bool CanDispatchEvent(const PlatformEvent& event) override;
29 virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; 29 virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
30 30
31 void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock); 31 void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
32 32
33 // How long the cached output is valid after startup. 33 // How long the cached output is valid after startup.
34 static const int kUseCacheAfterStartupMs; 34 static const int kUseCacheAfterStartupMs;
35 35
36 private: 36 private:
37 NativeDisplayDelegateX11::HelperDelegate* delegate_; // Not owned. 37 NativeDisplayDelegateX11::HelperDelegate* delegate_; // Not owned.
38 38
39 // The base of the event numbers used to represent XRandr events used in 39 // The base of the event numbers used to represent XRandr events used in
40 // decoding events regarding output add/remove. 40 // decoding events regarding output add/remove.
41 int xrandr_event_base_; 41 int xrandr_event_base_;
42 42
43 base::TimeTicks startup_time_; 43 base::TimeTicks startup_time_;
44 44
45 scoped_ptr<base::TickClock> tick_clock_; 45 scoped_ptr<base::TickClock> tick_clock_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(NativeDisplayEventDispatcherX11); 47 DISALLOW_COPY_AND_ASSIGN(NativeDisplayEventDispatcherX11);
48 }; 48 };
49 49
50 } // namespace ui 50 } // namespace ui
51 51
52 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_ 52 #endif // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698