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

Side by Side Diff: ui/events/platform/x11/x11_event_source_libevent.cc

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
« no previous file with comments | « ui/events/platform/x11/x11_event_source.h ('k') | ui/events/test/mock_motion_event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/events/platform/x11/x11_event_source.h" 5 #include "ui/events/platform/x11/x11_event_source.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/message_loop/message_pump_libevent.h" 10 #include "base/message_loop/message_pump_libevent.h"
(...skipping 21 matching lines...) Expand all
32 if (!base::MessageLoop::current()) 32 if (!base::MessageLoop::current())
33 return; 33 return;
34 34
35 int fd = ConnectionNumber(display()); 35 int fd = ConnectionNumber(display());
36 base::MessageLoopForUI::current()->WatchFileDescriptor(fd, true, 36 base::MessageLoopForUI::current()->WatchFileDescriptor(fd, true,
37 base::MessagePumpLibevent::WATCH_READ, &watcher_controller_, this); 37 base::MessagePumpLibevent::WATCH_READ, &watcher_controller_, this);
38 initialized_ = true; 38 initialized_ = true;
39 } 39 }
40 40
41 // PlatformEventSource: 41 // PlatformEventSource:
42 virtual void OnDispatcherListChanged() OVERRIDE { 42 virtual void OnDispatcherListChanged() override {
43 AddEventWatcher(); 43 AddEventWatcher();
44 } 44 }
45 45
46 // base::MessagePumpLibevent::Watcher: 46 // base::MessagePumpLibevent::Watcher:
47 virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { 47 virtual void OnFileCanReadWithoutBlocking(int fd) override {
48 DispatchXEvents(); 48 DispatchXEvents();
49 } 49 }
50 50
51 virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { 51 virtual void OnFileCanWriteWithoutBlocking(int fd) override {
52 NOTREACHED(); 52 NOTREACHED();
53 } 53 }
54 54
55 base::MessagePumpLibevent::FileDescriptorWatcher watcher_controller_; 55 base::MessagePumpLibevent::FileDescriptorWatcher watcher_controller_;
56 bool initialized_; 56 bool initialized_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(X11EventSourceLibevent); 58 DISALLOW_COPY_AND_ASSIGN(X11EventSourceLibevent);
59 }; 59 };
60 60
61 } // namespace 61 } // namespace
62 62
63 scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() { 63 scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() {
64 return scoped_ptr<PlatformEventSource>( 64 return scoped_ptr<PlatformEventSource>(
65 new X11EventSourceLibevent(gfx::GetXDisplay())); 65 new X11EventSourceLibevent(gfx::GetXDisplay()));
66 } 66 }
67 67
68 } // namespace ui 68 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/platform/x11/x11_event_source.h ('k') | ui/events/test/mock_motion_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698