Moving input device hotplug event processing outside of ui/display

ui/display/chromeos/display_configurator.h

Index: ui/display/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index 093f0cca8e4f931d04233b58363fa6ad30447c96..fe1f603cf02d4cccf415cb75f80a3ff59145cab9 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -42,9 +42,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
 
     DisplaySnapshot* display;  // Not owned.
 
-    // XInput device ID or 0 if this display isn't a touchscreen.
-    int touch_device_id;
-
     // User-selected mode for the display.
     const DisplayMode* selected_mode;
 
@@ -97,18 +94,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
     virtual bool SoftwareMirroringEnabled() const = 0;
   };
 
-  class TouchscreenDelegate {
-   public:
-    virtual ~TouchscreenDelegate() {}
-
-    // Searches for touchscreens among input devices,
-    // and tries to match them up to screens in |displays|.
-    // |displays| is an array of detected screens.
-    // If a touchscreen with same resolution as a display's native mode
-    // is detected, its id will be stored in this display.
-    virtual void AssociateTouchscreens(std::vector<DisplayState>* displays) = 0;
-  };
-
   // Helper class used by tests.
   class TestApi {
    public:
@@ -169,8 +154,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   // delegates passed in and sets |configure_display_| to true. Should be called
   // before Init().
   void SetDelegatesForTesting(
-      scoped_ptr<NativeDisplayDelegate> display_delegate,
-      scoped_ptr<TouchscreenDelegate> touchscreen_delegate);
+      scoped_ptr<NativeDisplayDelegate> display_delegate);
 
   // Sets the initial value of |power_state_|.  Must be called before Start().
   void SetInitialDisplayPower(chromeos::DisplayPowerState power_state);
@@ -255,11 +239,10 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
-  // If |native_display_delegate_| and |touchscreen_delegate_| are not set, then
-  // set them to the passed in values.
+  // If |native_display_delegate_| is not set, then set it to
+  // |display_delegate|.
   void InitializeDelegates(
-      scoped_ptr<NativeDisplayDelegate> display_delegate,
-      scoped_ptr<TouchscreenDelegate> touchscreen_delegate);
+      scoped_ptr<NativeDisplayDelegate> display_delegate);
 
   // Performs platform specific delegate initialization.
   void PlatformInitialize();
@@ -327,7 +310,6 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   StateController* state_controller_;
   SoftwareMirroringController* mirroring_controller_;
   scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
-  scoped_ptr<TouchscreenDelegate> touchscreen_delegate_;
 
   // Used to enable modes which rely on panel fitting.
   bool is_panel_fitting_enabled_;