Move touchscreen device caching to DeviceDataManager

ui/events/platform/x11/x11_event_source.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/platform/x11/x11_event_source.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
 #include "base/logging.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/x/device_data_manager_x11.h"
+#include "ui/events/x/hotplug_event_handler_x11.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 int g_xinput_opcode = -1;
 
 bool InitializeXInput2(XDisplay* display) {
   if (!display)
@@ skipping 52 matching lines @@
   return true;
 }
 
 }  // namespace
 
 X11EventSource::X11EventSource(XDisplay* display)
     : display_(display),
       continue_stream_(true) {
   CHECK(display_);
   DeviceDataManagerX11::CreateInstance();
+  hotplug_event_handler_.reset(
+      new HotplugEventHandlerX11(DeviceDataManager::GetInstance()));
   InitializeXInput2(display_);
   InitializeXkb(display_);
+
+  // Force the initial device query to have an update list of active devices.
+  hotplug_event_handler_->OnHotplugEvent();
 }
 
 X11EventSource::~X11EventSource() {
 }
 
 // static
 X11EventSource* X11EventSource::GetInstance() {
   return static_cast<X11EventSource*>(PlatformEventSource::GetInstance());
 }
 
@@ skipping 30 matching lines @@
   bool have_cookie = false;
   if (xevent->type == GenericEvent &&
       XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     have_cookie = true;
   }
 
   uint32_t action = PlatformEventSource::DispatchEvent(xevent);
   if (xevent->type == GenericEvent &&
       xevent->xgeneric.evtype == XI_HierarchyChanged) {
     ui::UpdateDeviceList();
+    hotplug_event_handler_->OnHotplugEvent();
   }
 
   if (have_cookie)
     XFreeEventData(xevent->xgeneric.display, &xevent->xcookie);
   return action;
 }
 
 void X11EventSource::StopCurrentEventStream() {
   continue_stream_ = false;
 }
 
 }  // namespace ui