Moving input device hotplug event processing outside of ui/display

ui/display/chromeos/x11/native_display_delegate_x11.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/display/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/XInput2.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/display/chromeos/x11/display_mode_x11.h"
 #include "ui/display/chromeos/x11/display_snapshot_x11.h"
 #include "ui/display/chromeos/x11/display_util_x11.h"
 #include "ui/display/chromeos/x11/native_display_event_dispatcher_x11.h"
 #include "ui/display/types/chromeos/native_display_observer.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
-#include "ui/events/device_data_manager.h"
-#include "ui/events/input_device_event_observer.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 // DPI measurements.
@@ skipping 30 matching lines @@
       resampled->green[i] = gamma_ramp->green[gamma_ramp->size - 1];
       resampled->blue[i] = gamma_ramp->blue[gamma_ramp->size - 1];
     }
   }
 
 #undef RESAMPLE
   XRRFreeGamma(gamma_ramp);
   return resampled;
 }
 
-class InputHotplugEventObserver : public InputDeviceEventObserver {
- public:
-  explicit InputHotplugEventObserver(
-      NativeDisplayDelegateX11::HelperDelegate* delegate)
-      : delegate_(delegate) {}
-  virtual ~InputHotplugEventObserver() {}
-
-  // InputDeviceEventObserver:
-  virtual void OnInputDeviceConfigurationChanged() OVERRIDE {
-    delegate_->NotifyDisplayObservers();
-  }
-
- private:
-  NativeDisplayDelegateX11::HelperDelegate* delegate_;  // Not owned.
-
-  DISALLOW_COPY_AND_ASSIGN(InputHotplugEventObserver);
-};
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeDisplayDelegateX11::HelperDelegateX11
 
 class NativeDisplayDelegateX11::HelperDelegateX11
     : public NativeDisplayDelegateX11::HelperDelegate {
  public:
   HelperDelegateX11(NativeDisplayDelegateX11* delegate) : delegate_(delegate) {}
   virtual ~HelperDelegateX11() {}
@@ skipping 26 matching lines @@
       window_(DefaultRootWindow(display_)),
       screen_(NULL),
       background_color_argb_(0) {}
 
 NativeDisplayDelegateX11::~NativeDisplayDelegateX11() {
   if (ui::PlatformEventSource::GetInstance()) {
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(
         platform_event_dispatcher_.get());
   }
 
-  if (input_hotplug_observer_) {
-    ui::DeviceDataManager::GetInstance()->RemoveObserver(
-        input_hotplug_observer_.get());
-  }
-
   STLDeleteContainerPairSecondPointers(modes_.begin(), modes_.end());
 }
 
 void NativeDisplayDelegateX11::Initialize() {
   int error_base_ignored = 0;
   int xrandr_event_base = 0;
   XRRQueryExtension(display_, &xrandr_event_base, &error_base_ignored);
 
   helper_delegate_.reset(new HelperDelegateX11(this));
   platform_event_dispatcher_.reset(new NativeDisplayEventDispatcherX11(
       helper_delegate_.get(), xrandr_event_base));
-  input_hotplug_observer_.reset(
-      new InputHotplugEventObserver(helper_delegate_.get()));
-  ui::DeviceDataManager::GetInstance()->AddObserver(
-      input_hotplug_observer_.get());
 
   if (ui::PlatformEventSource::GetInstance()) {
     ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(
         platform_event_dispatcher_.get());
   }
 }
 
 void NativeDisplayDelegateX11::GrabServer() {
   CHECK(!screen_) << "Server already grabbed";
   XGrabServer(display_);
@@ skipping 502 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui