Refactoring gamepad polling to support dynamically added sources

content/browser/gamepad/xbox_data_fetcher_mac.h

 // Copyright 2013 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 CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_
 #define CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/mac/scoped_ioplugininterface.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/gamepad/gamepad_data_fetcher.h"
+
+struct IOUSBDeviceStruct320;
+struct IOUSBInterfaceStruct300;
+
+namespace content {
 
 class XboxController {
  public:
   enum ControllerType {
     UNKNOWN_CONTROLLER,
     XBOX_360_CONTROLLER,
     XBOX_ONE_CONTROLLER
   };
 
   enum LEDPattern {
@@ skipping 64 matching lines @@
   void ProcessXbox360Packet(size_t length);
   void ProcessXboxOnePacket(size_t length);
   void QueueRead();
 
   void IOError();
 
   void WriteXboxOneInit();
 
   // Handle for the USB device. IOUSBDeviceStruct320 is the latest version of
   // the device API that is supported on Mac OS 10.6.
-  base::mac::ScopedIOPluginInterface<struct IOUSBDeviceStruct320> device_;
+  base::mac::ScopedIOPluginInterface<IOUSBDeviceStruct320> device_;
 
   // Handle for the interface on the device which sends button and analog data.
   // The other interfaces (for the ChatPad and headset) are ignored.
-  base::mac::ScopedIOPluginInterface<struct IOUSBInterfaceStruct300> interface_;
+  base::mac::ScopedIOPluginInterface<IOUSBInterfaceStruct300> interface_;
 
   bool device_is_open_;
   bool interface_is_open_;
 
   base::ScopedCFTypeRef<CFRunLoopSourceRef> source_;
 
   // This will be set to the max packet size reported by the interface, which
   // is 32 bytes. I would have expected USB to do message framing itself, but
   // somehow we still sometimes (rarely!) get packets off the interface which
   // aren't correctly framed. The 360 controller frames its packets with a 2
@@ skipping 10 matching lines @@
 
   Delegate* delegate_;
 
   ControllerType controller_type_;
   int read_endpoint_;
   int control_endpoint_;
 
   DISALLOW_COPY_AND_ASSIGN(XboxController);
 };
 
-class XboxDataFetcher : public XboxController::Delegate {
+class XboxDataFetcher : public GamepadDataFetcher,
+                        public XboxController::Delegate {
  public:
-  class Delegate {
-   public:
-    virtual void XboxDeviceAdd(XboxController* device) = 0;
-    virtual void XboxDeviceRemove(XboxController* device) = 0;
-    virtual void XboxValueChanged(XboxController* device,
-                                  const XboxController::Data& data) = 0;
-  };
+  XboxDataFetcher();
+  ~XboxDataFetcher() override;
 
-  explicit XboxDataFetcher(Delegate* delegate);
-  virtual ~XboxDataFetcher();
+  void GetGamepadData(bool devices_changed_hint) override;
 
   bool RegisterForNotifications();
   bool RegisterForDeviceNotifications(
     int vendor_id,
     int product_id,
     base::mac::ScopedIOObject<io_iterator_t>* added_iter,
     base::mac::ScopedIOObject<io_iterator_t>* removed_iter);
   void UnregisterFromNotifications();
 
   XboxController* ControllerForLocation(UInt32 location_id);
 
  private:
   static void DeviceAdded(void* context, io_iterator_t iterator);
   static void DeviceRemoved(void* context, io_iterator_t iterator);
+  void OnAddedToProvider() override;
   void AddController(XboxController* controller);
   void RemoveController(XboxController* controller);
   void RemoveControllerByLocationID(uint32_t id);
   void XboxControllerGotData(XboxController* controller,
                              const XboxController::Data& data) override;
   void XboxControllerError(XboxController* controller) override;
 
-  Delegate* delegate_;
+  //Delegate* delegate_;

[scottmg, 2016/01/18 22:54:52]

Delete.

 
   std::set<XboxController*> controllers_;
 
   bool listening_;
 
   // port_ owns source_, so this doesn't need to be a ScopedCFTypeRef, but we
   // do need to maintain a reference to it so we can invalidate it.
   CFRunLoopSourceRef source_;
   IONotificationPortRef port_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_360_device_added_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_360_device_removed_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_one_device_added_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_one_device_removed_iter_;
 
   DISALLOW_COPY_AND_ASSIGN(XboxDataFetcher);
 };
 
+} // namespace content

[scottmg, 2016/01/18 22:54:52]

2 space before //

+
 #endif  // CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_