ozone: mouse button swap shouldn't affect touchpad physical click

ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.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/libgestures_glue/gesture_interpreter_libevdev_cros.h"
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/timer/timer.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
+#include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_device_util.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace ui {
 
@@ skipping 80 matching lines @@
 
 GestureInterpreterLibevdevCros::GestureInterpreterLibevdevCros(
     int id,
     EventModifiersEvdev* modifiers,
     MouseButtonMapEvdev* button_map,
     CursorDelegateEvdev* cursor,
     KeyboardEvdev* keyboard,
     GesturePropertyProvider* property_provider,
     const EventDispatchCallback& callback)
     : id_(id),
+      is_mouse_(false),
       modifiers_(modifiers),
       button_map_(button_map),
       cursor_(cursor),
       keyboard_(keyboard),
       property_provider_(property_provider),
       dispatch_callback_(callback),
       interpreter_(NULL),
       evdev_(NULL),
       device_properties_(new GestureDeviceProperties) {
   memset(&prev_key_state_, 0, sizeof(prev_key_state_));
@@ skipping 24 matching lines @@
   DCHECK(evdev->info.is_monotonic) << "libevdev must use monotonic timestamps";
   VLOG(9) << "HACK DO NOT REMOVE OR LINK WILL FAIL" << (void*)gestures_log;
 
   // Set device pointer and initialize properties.
   evdev_ = evdev;
   GesturesPropFunctionsWrapper::InitializeDeviceProperties(
       this, device_properties_.get());
   HardwareProperties hwprops =
       GestureHardwareProperties(evdev, device_properties_.get());
   GestureInterpreterDeviceClass devclass = GestureDeviceClass(evdev);
+  is_mouse_ = property_provider_->IsDeviceIdOfType(id_, DT_MOUSE);
 
   // Create & initialize GestureInterpreter.
   DCHECK(!interpreter_);
   interpreter_ = NewGestureInterpreter();
   GestureInterpreterSetPropProvider(
       interpreter_,
       const_cast<GesturesPropProvider*>(&kGesturePropProvider),
       this);
   GestureInterpreterInitialize(interpreter_, devclass);
   GestureInterpreterSetHardwareProperties(interpreter_, &hwprops);
@@ skipping 37 matching lines @@
     fingers[current_finger].position_x = slot->position_x;
     fingers[current_finger].position_y = slot->position_y;
     fingers[current_finger].tracking_id = slot->tracking_id;
     current_finger++;
   }
   hwstate.touch_cnt = Event_Get_Touch_Count(evdev);
   hwstate.finger_cnt = current_finger;
   hwstate.fingers = fingers;
 
   // Buttons.
+  //
+  // We do button mapping for physical clicks only when the device is
+  // mouse-like (e.g., normal mouse and multi-touch mouse).
   if (Event_Get_Button_Left(evdev)) {
-    hwstate.buttons_down |=
-        GetGestureButton(button_map_->GetMappedButton(BTN_LEFT));
+    hwstate.buttons_down |= GetGestureButton(
+        is_mouse_ ? button_map_->GetMappedButton(BTN_LEFT) : BTN_LEFT);
   }
   if (Event_Get_Button_Middle(evdev)) {
-    hwstate.buttons_down |=
-        GetGestureButton(button_map_->GetMappedButton(BTN_MIDDLE));
+    hwstate.buttons_down |= GetGestureButton(
+        is_mouse_ ? button_map_->GetMappedButton(BTN_MIDDLE) : BTN_MIDDLE);
   }
   if (Event_Get_Button_Right(evdev)) {
-    hwstate.buttons_down |=
-        GetGestureButton(button_map_->GetMappedButton(BTN_RIGHT));
+    hwstate.buttons_down |= GetGestureButton(
+        is_mouse_ ? button_map_->GetMappedButton(BTN_RIGHT) : BTN_RIGHT);
   }
 
   GestureInterpreterPushHardwareState(interpreter_, &hwstate);
 }
 
 void GestureInterpreterLibevdevCros::OnGestureReady(const Gesture* gesture) {
   switch (gesture->type) {
     case kGestureTypeMove:
       OnGestureMove(gesture, &gesture->details.move);
       break;
@@ skipping 244 matching lines @@
       keyboard_->OnKeyChange(key, value);
     }
   }
 
   // Update internal key state.
   for (unsigned long i = 0; i < EVDEV_BITS_TO_LONGS(KEY_CNT); ++i)
     prev_key_state_[i] = evdev->key_state_bitmask[i];
 }
 
 }  // namespace ui