Revert of Refactoring gamepad polling to support dynamically added sources

content/browser/gamepad/raw_input_data_fetcher_win.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 CONTENT_BROWSER_GAMEPAD_RAW_INPUT_DATA_FETCHER_WIN_H_
 #define CONTENT_BROWSER_GAMEPAD_RAW_INPUT_DATA_FETCHER_WIN_H_
 
 #include "build/build_config.h"
 
 #include <stdint.h>
@@ skipping 22 matching lines @@
   HIDP_VALUE_CAPS caps;
   float value;
   bool active;
   unsigned long bitmask;
 };
 
 struct RawGamepadInfo {
   RawGamepadInfo();
   ~RawGamepadInfo();
 
-  int source_id;
-  int enumeration_id;
   HANDLE handle;
   scoped_ptr<uint8_t[]> ppd_buffer;
   PHIDP_PREPARSED_DATA preparsed_data;
 
   uint32_t report_id;
   uint32_t vendor_id;
   uint32_t product_id;
 
   wchar_t id[blink::WebGamepad::idLengthCap];
 
   uint32_t buttons_length;
   bool buttons[blink::WebGamepad::buttonsLengthCap];
 
   uint32_t axes_length;
   RawGamepadAxis axes[blink::WebGamepad::axesLengthCap];
 };
 
 class RawInputDataFetcher
-    : public GamepadDataFetcher,
-      public base::SupportsWeakPtr<RawInputDataFetcher>,
+    : public base::SupportsWeakPtr<RawInputDataFetcher>,
       public base::MessageLoop::DestructionObserver {
  public:
   explicit RawInputDataFetcher();
   ~RawInputDataFetcher() override;
 
   // DestructionObserver overrides.
   void WillDestroyCurrentMessageLoop() override;
 
-  void GetGamepadData(bool devices_changed_hint) override;
-  void PauseHint(bool paused) override;
+  bool Available() { return rawinput_available_; }
+  void StartMonitor();
+  void StopMonitor();
+
+  std::vector<RawGamepadInfo*> EnumerateDevices();
+  RawGamepadInfo* GetGamepadInfo(HANDLE handle);
 
  private:
-  void OnAddedToProvider() override;
-
-  void StartMonitor();
-  void StopMonitor();
-  void EnumerateDevices();
   RawGamepadInfo* ParseGamepadInfo(HANDLE hDevice);
   void UpdateGamepad(RAWINPUT* input, RawGamepadInfo* gamepad_info);
   // Handles WM_INPUT messages.
   LRESULT OnInput(HRAWINPUT input_handle);
   // Handles messages received by |window_|.
   bool HandleMessage(UINT message,
                      WPARAM wparam,
                      LPARAM lparam,
                      LRESULT* result);
   RAWINPUTDEVICE* GetRawInputDevices(DWORD flags);
@@ skipping 29 matching lines @@
 
   // Get functions from dynamically loaded hid.dll. Returns true if loading was
   // successful.
   bool GetHidDllFunctions();
 
   base::ScopedNativeLibrary hid_dll_;
   scoped_ptr<base::win::MessageWindow> window_;
   bool rawinput_available_;
   bool filter_xinput_;
   bool events_monitored_;
-  int last_source_id_;
-  int last_enumeration_id_;
 
-  typedef std::map<HANDLE, RawGamepadInfo*> ControllerMap;
-  ControllerMap controllers_;
+  std::map<HANDLE, RawGamepadInfo*> controllers_;
 
   // Function pointers to HID functionality, retrieved in
   // |GetHidDllFunctions|.
   HidPGetCapsFunc hidp_get_caps_;
   HidPGetButtonCapsFunc hidp_get_button_caps_;
   HidPGetValueCapsFunc hidp_get_value_caps_;
   HidPGetUsagesExFunc hidp_get_usages_ex_;
   HidPGetUsageValueFunc hidp_get_usage_value_;
   HidPGetScaledUsageValueFunc hidp_get_scaled_usage_value_;
   HidDGetStringFunc hidd_get_product_string_;
 
   DISALLOW_COPY_AND_ASSIGN(RawInputDataFetcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GAMEPAD_RAW_INPUT_DATA_FETCHER_WIN_H_