Move touchscreen device caching to DeviceDataManager

ui/display/chromeos/x11/native_display_delegate_x11.h

 // 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.
 
 #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 23 matching lines @@
 typedef _XRROutputInfo XRROutputInfo;
 struct _XRRScreenResources;
 typedef _XRRScreenResources XRRScreenResources;
 struct _XRRCrtcGamma;
 typedef _XRRCrtcGamma XRRCrtcGamma;
 
 namespace ui {
 
 class DisplayModeX11;
 class DisplaySnapshotX11;
+class InputDeviceEventObserver;
 class NativeDisplayEventDispatcherX11;
 
 class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
  public:
   // Helper class that allows NativeDisplayEventDispatcherX11 and
   // NativeDisplayDelegateX11::PlatformEventObserverX11 to interact with this
   // class or with mocks in tests.
   class HelperDelegate {
    public:
     virtual ~HelperDelegate() {}
@@ skipping 35 matching lines @@
       GetAvailableColorCalibrationProfiles(
           const DisplaySnapshot& output) OVERRIDE;
   virtual bool SetColorCalibrationProfile(
       const DisplaySnapshot& output,
       ColorCalibrationProfile new_profile) OVERRIDE;
   virtual void AddObserver(NativeDisplayObserver* observer) OVERRIDE;
   virtual void RemoveObserver(NativeDisplayObserver* observer) OVERRIDE;
 
  private:
   class HelperDelegateX11;
-  class PlatformEventObserverX11;
 
   // Parses all the modes made available by |screen_|.
   void InitModes();
 
   // Helper method for GetOutputs() that returns an OutputSnapshot struct based
   // on the passed-in information.
   DisplaySnapshotX11* InitDisplaySnapshot(RROutput id,
                                           XRROutputInfo* info,
                                           RRCrtc* last_used_crtc,
                                           int index);
@@ skipping 33 matching lines @@
   // propagate them.
   ScopedVector<DisplaySnapshot> cached_outputs_;
 
   scoped_ptr<HelperDelegate> helper_delegate_;
 
   // Processes X11 display events associated with the root window and notifies
   // |observers_| when a display change has occurred.
   scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;
 
   // Processes X11 display events that have no X11 window associated with it.
-  scoped_ptr<PlatformEventObserverX11> platform_event_observer_;
+  scoped_ptr<InputDeviceEventObserver> input_hotplug_observer_;
 
   // List of observers waiting for display configuration change events.
   ObserverList<NativeDisplayObserver> observers_;
 
   // A background color used during boot time + multi displays.
   uint32_t background_color_argb_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_