ozone: evdev: Add property to identify internal or external devices

ui/events/ozone/evdev/touch_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/touch_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <poll.h>
@@ skipping 56 matching lines @@
       type_(ET_UNKNOWN),
       radius_x_(0),
       radius_y_(0),
       pressure_(0) {
 }
 
 TouchEventConverterEvdev::TouchEventConverterEvdev(
     int fd,
     base::FilePath path,
     int id,
+    InputDeviceType type,
     const EventDispatchCallback& callback)
-    : EventConverterEvdev(fd, path, id),
+    : EventConverterEvdev(fd, path, id, type),
       callback_(callback),
       syn_dropped_(false),
       is_type_a_(false),
-      current_slot_(0),
-      is_internal_(GetInputDeviceTypeFromPath(path) == INPUT_DEVICE_INTERNAL) {
+      current_slot_(0) {
 }
 
 TouchEventConverterEvdev::~TouchEventConverterEvdev() {
   Stop();
   close(fd_);
 }
 
 void TouchEventConverterEvdev::Initialize(const EventDeviceInfo& info) {
   pressure_min_ = info.GetAbsMinimum(ABS_MT_PRESSURE);
   pressure_max_ = info.GetAbsMaximum(ABS_MT_PRESSURE);
   x_min_tuxels_ = info.GetAbsMinimum(ABS_MT_POSITION_X);
   x_num_tuxels_ = info.GetAbsMaximum(ABS_MT_POSITION_X) - x_min_tuxels_ + 1;
   y_min_tuxels_ = info.GetAbsMinimum(ABS_MT_POSITION_Y);
   y_num_tuxels_ = info.GetAbsMaximum(ABS_MT_POSITION_Y) - y_min_tuxels_ + 1;
 
   // Apply --touch-calibration.
-  if (is_internal_) {
+  if (type() == INPUT_DEVICE_INTERNAL) {
     TouchCalibration cal = {};
     GetTouchCalibration(&cal);
     x_min_tuxels_ += cal.bezel_left;
     x_num_tuxels_ -= cal.bezel_left + cal.bezel_right;
     y_min_tuxels_ += cal.bezel_top;
     y_num_tuxels_ -= cal.bezel_top + cal.bezel_bottom;
 
     VLOG(1) << "applying touch calibration: "
             << base::StringPrintf("[%d, %d, %d, %d]", cal.bezel_left,
                                   cal.bezel_right, cal.bezel_top,
@@ skipping 26 matching lines @@
 }
 
 bool TouchEventConverterEvdev::HasTouchscreen() const {
   return true;
 }
 
 gfx::Size TouchEventConverterEvdev::GetTouchscreenSize() const {
   return native_size_;
 }
 
-bool TouchEventConverterEvdev::IsInternal() const {
-  return is_internal_;
-}
-
 void TouchEventConverterEvdev::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[MAX_FINGERS * 6 + 1];
   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;
@@ skipping 144 matching lines @@
 
       // Subsequent events for this finger will be touch-move until it
       // is released.
       events_[i].type_ = ET_TOUCH_MOVED;
     }
   }
   altered_slots_.reset();
 }
 
 }  // namespace ui