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

Side by Side Diff: trunk/src/ui/base/ozone/event_factory_ozone.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/base/ozone/event_factory_ozone.h" 5 #include "ui/base/ozone/event_factory_ozone.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <linux/input.h> 8 #include <linux/input.h>
9 #include <poll.h> 9 #include <poll.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/message_loop/message_pump_ozone.h" 12 #include "base/message_pump_ozone.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "ui/base/ozone/key_event_converter_ozone.h" 14 #include "ui/base/ozone/key_event_converter_ozone.h"
15 #include "ui/base/ozone/touch_event_converter_ozone.h" 15 #include "ui/base/ozone/touch_event_converter_ozone.h"
16 16
17 namespace ui { 17 namespace ui {
18 18
19 EventFactoryOzone::EventFactoryOzone() {} 19 EventFactoryOzone::EventFactoryOzone() {}
20 20
21 EventFactoryOzone::~EventFactoryOzone() { 21 EventFactoryOzone::~EventFactoryOzone() {
22 for (unsigned i = 0; i < fd_controllers_.size(); i++) { 22 for (unsigned i = 0; i < fd_controllers_.size(); i++) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 fd, true, base::MessagePumpLibevent::WATCH_READ, controller, watcher); 57 fd, true, base::MessagePumpLibevent::WATCH_READ, controller, watcher);
58 evdev_watchers_.push_back(watcher); 58 evdev_watchers_.push_back(watcher);
59 fd_controllers_.push_back(controller); 59 fd_controllers_.push_back(controller);
60 } else { 60 } else {
61 close(fd); 61 close(fd);
62 } 62 }
63 } 63 }
64 } 64 }
65 65
66 } // namespace ui 66 } // namespace ui
OLDNEW
« no previous file with comments | « trunk/src/ui/base/ozone/event_factory_ozone.h ('k') | trunk/src/ui/base/ozone/touch_event_converter_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698