ozone: evdev: Move read polling into EventConverterEvdev

ui/events/ozone/evdev/key_event_converter_evdev.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/ozone/evdev/key_event_converter_evdev.h"
 
 #include <errno.h>
 #include <linux/input.h>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 176 matching lines @@
 
 bool IsLockButton(unsigned int code) { return code == KEY_CAPSLOCK; }
 
 }  // namespace
 
 KeyEventConverterEvdev::KeyEventConverterEvdev(
     int fd,
     base::FilePath path,
     EventModifiersEvdev* modifiers,
     const EventDispatchCallback& callback)
-    : EventConverterEvdev(callback),
-      fd_(fd),
-      path_(path),
+    : EventConverterEvdev(fd, path),
+      callback_(callback),
       modifiers_(modifiers) {
   // TODO(spang): Initialize modifiers using EVIOCGKEY.
 }
 
 KeyEventConverterEvdev::~KeyEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
-void KeyEventConverterEvdev::Start() {
-  base::MessageLoopForUI::current()->WatchFileDescriptor(
-      fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
-}
-
-void KeyEventConverterEvdev::Stop() {
-  controller_.StopWatchingFileDescriptor();
-}
-
 void KeyEventConverterEvdev::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[4];
   ssize_t read_size = read(fd, inputs, sizeof(inputs));
   if (read_size < 0) {
     if (errno == EINTR || errno == EAGAIN)
       return;
     if (errno != ENODEV)
       PLOG(ERROR) << "error reading device " << path_.value();
     Stop();
     return;
   }
 
   CHECK_EQ(read_size % sizeof(*inputs), 0u);
   ProcessEvents(inputs, read_size / sizeof(*inputs));
 }
 
-void KeyEventConverterEvdev::OnFileCanWriteWithoutBlocking(int fd) {
-  NOTREACHED();
-}
-
 void KeyEventConverterEvdev::ProcessEvents(const input_event* inputs,
                                            int count) {
   for (int i = 0; i < count; ++i) {
     const input_event& input = inputs[i];
     if (input.type == EV_KEY) {
       ConvertKeyEvent(input.code, input.value);
     } else if (input.type == EV_SYN) {
       // TODO(sadrul): Handle this case appropriately.
     }
   }
@@ skipping 15 matching lines @@
     }
   }
 
   int flags = modifiers_->GetModifierFlags();
 
   KeyEvent key_event(
       down ? ET_KEY_PRESSED : ET_KEY_RELEASED,
       code,
       KeycodeConverter::NativeKeycodeToCode(key + kXkbKeycodeOffset),
       flags);
-  DispatchEventToCallback(&key_event);
+  callback_.Run(&key_event);
 }
 
 }  // namespace ui