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

Side by Side Diff: ui/events/platform/x11/x11_event_source.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_PLATFORM_X11_X11_EVENT_SOURCE_H_ 5 #ifndef UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
6 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_ 6 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/events/events_export.h" 9 #include "ui/events/events_export.h"
10 #include "ui/events/platform/platform_event_source.h" 10 #include "ui/events/platform/platform_event_source.h"
(...skipping 30 matching lines...) Expand all
41 // dropped on the floor. This method exists because mapping a window is 41 // dropped on the floor. This method exists because mapping a window is
42 // asynchronous (and we receive an XEvent when mapped), while there are also 42 // asynchronous (and we receive an XEvent when mapped), while there are also
43 // functions which require a mapped window. 43 // functions which require a mapped window.
44 void BlockUntilWindowMapped(XID window); 44 void BlockUntilWindowMapped(XID window);
45 45
46 protected: 46 protected:
47 XDisplay* display() { return display_; } 47 XDisplay* display() { return display_; }
48 48
49 private: 49 private:
50 // PlatformEventSource: 50 // PlatformEventSource:
51 virtual uint32_t DispatchEvent(XEvent* xevent) OVERRIDE; 51 virtual uint32_t DispatchEvent(XEvent* xevent) override;
52 virtual void StopCurrentEventStream() OVERRIDE; 52 virtual void StopCurrentEventStream() override;
53 53
54 // The connection to the X11 server used to receive the events. 54 // The connection to the X11 server used to receive the events.
55 XDisplay* display_; 55 XDisplay* display_;
56 56
57 // Keeps track of whether this source should continue to dispatch all the 57 // Keeps track of whether this source should continue to dispatch all the
58 // available events. 58 // available events.
59 bool continue_stream_; 59 bool continue_stream_;
60 60
61 scoped_ptr<HotplugEventHandlerX11> hotplug_event_handler_; 61 scoped_ptr<HotplugEventHandlerX11> hotplug_event_handler_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(X11EventSource); 63 DISALLOW_COPY_AND_ASSIGN(X11EventSource);
64 }; 64 };
65 65
66 } // namespace ui 66 } // namespace ui
67 67
68 #endif // UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_ 68 #endif // UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_H_
OLDNEW
« no previous file with comments | « ui/events/platform/platform_event_source_unittest.cc ('k') | ui/events/platform/x11/x11_event_source_libevent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698