Move touchscreen device caching to DeviceDataManager

ui/events/device_data_manager.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_EVENTS_DEVICE_DATA_MANAGER_H_
 #define UI_EVENTS_DEVICE_DATA_MANAGER_H_
 
 #include <stdint.h>
 
+#include <vector>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
+#include "ui/events/device_hotplug_event_observer.h"
 #include "ui/events/events_base_export.h"
+#include "ui/events/touchscreen_device.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 
+class InputDeviceEventObserver;
+
 // Keeps track of device mappings and event transformations.
-class EVENTS_BASE_EXPORT DeviceDataManager {
+class EVENTS_BASE_EXPORT DeviceDataManager : public DeviceHotplugEventObserver {
  public:
   virtual ~DeviceDataManager();
 
   static void CreateInstance();
   static DeviceDataManager* GetInstance();
   static bool HasInstance();
 
   void ClearTouchTransformerRecord();
   void UpdateTouchInfoForDisplay(int64_t display_id,
                                  int touch_device_id,
                                  const gfx::Transform& touch_transformer);
   void ApplyTouchTransformer(int touch_device_id, float* x, float* y);
   int64_t GetDisplayForTouchDevice(int touch_device_id) const;
 
   void UpdateTouchRadiusScale(int touch_device_id, double scale);
   void ApplyTouchRadiusScale(int touch_device_id, double* radius);
 
+  std::vector<TouchscreenDevice> GetTouchscreenDevices() const;

[Daniel Erat, 2014/09/10 16:51:25]

can this instead be a simple inlined accessor that returns a const reference to
the member? (callers can assign to a local to do a copy if needed.)

[dnicoara, 2014/09/10 18:05:36]

Done.

+
+  void AddObserver(InputDeviceEventObserver* observer);
+  void RemoveObserver(InputDeviceEventObserver* observer);
+
  protected:
   DeviceDataManager();
 
   static DeviceDataManager* instance();
 
   static const int kMaxDeviceNum = 128;
 
  private:
   static DeviceDataManager* instance_;
 
   bool IsTouchDeviceIdValid(int touch_device_id) const;
 
+  // DeviceHotplugEventObserver:
+  virtual void OnTouchscreenDevices(
+      const std::vector<TouchscreenDevice>& devices) OVERRIDE;
+
   double touch_radius_scale_map_[kMaxDeviceNum];
 
   // Table to keep track of which display id is mapped to which touch device.
   int64_t touch_device_to_display_map_[kMaxDeviceNum];
   // Index table to find the TouchTransformer for a touch device.
   gfx::Transform touch_device_transformer_map_[kMaxDeviceNum];
 
+  std::vector<TouchscreenDevice> touchscreen_devices_;
+
+  ObserverList<InputDeviceEventObserver> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICE_DATA_MANAGER_H_