diff options
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/ui_base_switches.cc | 3 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.h | 1 | ||||
| -rw-r--r-- | ui/base/x/events_x.cc | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index ed4ffd2..28c4f71 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -90,6 +90,9 @@ const char kTouchOptimizedUIEnabled[] = "enabled"; // disabled: never optimized for touch. const char kTouchOptimizedUIDisabled[] = "disabled"; +// Enables touch events on the side bezels. +const char kTouchSideBezels[] = "touch-side-bezels"; + #if defined(USE_XI2_MT) // The calibration factors given as "<left>,<right>,<top>,<bottom>". const char kTouchCalibration[] = "touch-calibration"; diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 856d57f..0ef550f 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -37,6 +37,7 @@ UI_EXPORT extern const char kTouchOptimizedUI[]; UI_EXPORT extern const char kTouchOptimizedUIAuto[]; UI_EXPORT extern const char kTouchOptimizedUIDisabled[]; UI_EXPORT extern const char kTouchOptimizedUIEnabled[]; +UI_EXPORT extern const char kTouchSideBezels[]; #if defined(USE_XI2_MT) UI_EXPORT extern const char kTouchCalibration[]; diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index cfed6ce..3fb5ab3 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -629,7 +629,7 @@ int GetTouchId(const base::NativeEvent& xev) { double tracking_id; if (!manager->GetEventData( *xev, ui::DeviceDataManager::DT_TOUCH_TRACKING_ID, &tracking_id)) { - LOG(ERROR) << "Could not get the slot ID for the event. Using 0."; + LOG(ERROR) << "Could not get the tracking ID for the event. Using 0."; } else { slot = factory->GetSlotForTrackingID(tracking_id); ui::EventType type = ui::EventTypeFromNative(xev); |