Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: ui/events/devices/x11/device_list_cache_x11.cc

Issue 1521023002: Remove use_aura build arg. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/BUILD.gn ('k') | ui/events/gesture_detection/gesture_configuration_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/x11/device_list_cache_x11.cc
diff --git a/ui/events/devices/x11/device_list_cache_x11.cc b/ui/events/devices/x11/device_list_cache_x11.cc
index ffab2ea9a98f1b02d149cc27658c97308bbaefa1..f69e93f601a584be25085ab0964b97dbe6763f89 100644
--- a/ui/events/devices/x11/device_list_cache_x11.cc
+++ b/ui/events/devices/x11/device_list_cache_x11.cc
@@ -10,18 +10,6 @@
#include "base/message_loop/message_loop.h"
#include "ui/events/devices/x11/device_data_manager_x11.h"
-namespace {
-
-bool IsXI2Available() {
-#if defined(USE_AURA)
- return ui::DeviceDataManagerX11::GetInstance()->IsXInput2Available();
-#else
- return false;
-#endif
-}
-
-}
-
namespace ui {
DeviceListCacheX11::DeviceListCacheX11() {
@@ -39,11 +27,7 @@ void DeviceListCacheX11::UpdateDeviceList(Display* display) {
new_x_dev_list.devices.reset(
XListInputDevices(display, &new_x_dev_list.count));
- XIDeviceList& new_xi_dev_list = xi_dev_list_;
- new_xi_dev_list.devices.reset(
- IsXI2Available()
- ? XIQueryDevice(display, XIAllDevices, &new_xi_dev_list.count)
- : nullptr);
+ xi_dev_list_.devices.reset();
viettrungluu 2015/12/11 20:23:57 Possibly we should just get rid of xi_dev_list_, b
}
const XDeviceList& DeviceListCacheX11::GetXDeviceList(Display* display) {
« no previous file with comments | « ui/events/BUILD.gn ('k') | ui/events/gesture_detection/gesture_configuration_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698