diff options
Diffstat (limited to 'chromium/ui/events/ozone')
4 files changed, 10 insertions, 10 deletions
diff --git a/chromium/ui/events/ozone/device/udev/device_manager_udev.cc b/chromium/ui/events/ozone/device/udev/device_manager_udev.cc index 895a4d48b92..14d7e17d01d 100644 --- a/chromium/ui/events/ozone/device/udev/device_manager_udev.cc +++ b/chromium/ui/events/ozone/device/udev/device_manager_udev.cc @@ -95,7 +95,7 @@ void DeviceManagerUdev::CreateMonitor() { int fd = device::udev_monitor_get_fd(monitor_.get()); CHECK_GT(fd, 0); base::MessageLoopCurrentForUI::Get()->WatchFileDescriptor( - fd, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this); + fd, true, base::MessagePumpForUI::WATCH_READ, &controller_, this); } } diff --git a/chromium/ui/events/ozone/device/udev/device_manager_udev.h b/chromium/ui/events/ozone/device/udev/device_manager_udev.h index 26d694b909b..9d6a3ecce81 100644 --- a/chromium/ui/events/ozone/device/udev/device_manager_udev.h +++ b/chromium/ui/events/ozone/device/udev/device_manager_udev.h @@ -6,7 +6,7 @@ #define UI_EVENTS_OZONE_DEVICE_UDEV_DEVICE_MANAGER_UDEV_H_ #include "base/macros.h" -#include "base/message_loop/message_pump_libevent.h" +#include "base/message_loop/message_pump_for_ui.h" #include "base/observer_list.h" #include "device/udev_linux/scoped_udev.h" #include "ui/events/ozone/device/device_manager.h" @@ -17,7 +17,7 @@ class DeviceEvent; class DeviceEventObserver; class DeviceManagerUdev : public DeviceManager, - base::MessagePumpLibevent::FdWatcher { + base::MessagePumpForUI::FdWatcher { public: DeviceManagerUdev(); ~DeviceManagerUdev() override; @@ -33,14 +33,14 @@ class DeviceManagerUdev : public DeviceManager, void AddObserver(DeviceEventObserver* observer) override; void RemoveObserver(DeviceEventObserver* observer) override; - // base::MessagePumpLibevent::FdWatcher overrides: + // base::MessagePumpForUI::FdWatcher overrides: void OnFileCanReadWithoutBlocking(int fd) override; void OnFileCanWriteWithoutBlocking(int fd) override; device::ScopedUdevPtr udev_; device::ScopedUdevMonitorPtr monitor_; - base::MessagePumpLibevent::FdWatchController controller_; + base::MessagePumpForUI::FdWatchController controller_; base::ObserverList<DeviceEventObserver>::Unchecked observers_; diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc index 8f9bebfa0f7..684514ff011 100644 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc @@ -45,7 +45,7 @@ EventConverterEvdev::~EventConverterEvdev() { void EventConverterEvdev::Start() { base::MessageLoopCurrentForUI::Get()->WatchFileDescriptor( - fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this); + fd_, true, base::MessagePumpForUI::WATCH_READ, &controller_, this); watching_ = true; } diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h index 6cc2cc6b108..310039182c2 100644 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/macros.h" -#include "base/message_loop/message_pump_libevent.h" +#include "base/message_loop/message_loop_current.h" #include "ui/events/devices/input_device.h" #include "ui/events/ozone/evdev/event_dispatch_callback.h" #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" @@ -24,7 +24,7 @@ namespace ui { enum class DomCode; class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev - : public base::MessagePumpLibevent::FdWatcher { + : public base::MessagePumpForUI::FdWatcher { public: EventConverterEvdev(int fd, const base::FilePath& path, @@ -116,7 +116,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev static base::TimeTicks TimeTicksFromInputEvent(const input_event& event); protected: - // base::MessagePumpLibevent::FdWatcher: + // base::MessagePumpForUI::FdWatcher: void OnFileCanWriteWithoutBlocking(int fd) override; // File descriptor to read. @@ -133,7 +133,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev bool watching_ = false; // Controller for watching the input fd. - base::MessagePumpLibevent::FdWatchController controller_; + base::MessagePumpForUI::FdWatchController controller_; private: DISALLOW_COPY_AND_ASSIGN(EventConverterEvdev); |