OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/device_uma.h" | 5 #include "chrome/browser/chromeos/device_uma.h" |
6 | 6 |
7 #include <X11/extensions/XInput.h> | 7 #include <X11/extensions/XInput.h> |
8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 UMA_HISTOGRAM_ENUMERATION("Touchpad.Metrics", | 78 UMA_HISTOGRAM_ENUMERATION("Touchpad.Metrics", |
79 UMA_CROS_GESTURE_METRICS_NOISY_GROUND, | 79 UMA_CROS_GESTURE_METRICS_NOISY_GROUND, |
80 UMA_CROS_GESTURE_METRICS_COUNT); | 80 UMA_CROS_GESTURE_METRICS_COUNT); |
81 } | 81 } |
82 } | 82 } |
83 } | 83 } |
84 | 84 |
85 void DeviceUMA::CheckIncomingEvent(XEvent* event) { | 85 void DeviceUMA::CheckIncomingEvent(XEvent* event) { |
86 switch (event->type) { | 86 switch (event->type) { |
87 case GenericEvent: { | 87 case GenericEvent: { |
88 if (ui::DeviceDataManagerX11::GetInstance()->IsXIDeviceEvent(event) && | 88 ui::DeviceDataManagerX11* devices = |
89 ui::IsTouchpadEvent(event)) | 89 ui::DeviceDataManagerX11::GetInstance(); |
| 90 if (devices->IsXIDeviceEvent(event) && |
| 91 devices->IsTouchpadXInputEvent(event)) { |
90 CheckTouchpadEvent(event); | 92 CheckTouchpadEvent(event); |
| 93 } |
91 break; | 94 break; |
92 } | 95 } |
93 default: | 96 default: |
94 break; | 97 break; |
95 } | 98 } |
96 return; | 99 return; |
97 } | 100 } |
98 | 101 |
99 } // namespace chromeos | 102 } // namespace chromeos |
OLD | NEW |