use Loadlibrary/GetProcAddress for XInput, rather than /DELAYLOAD

content/browser/gamepad/platform_data_fetcher_win.h

Index: content/browser/gamepad/platform_data_fetcher_win.h
diff --git a/content/browser/gamepad/platform_data_fetcher_win.h b/content/browser/gamepad/platform_data_fetcher_win.h
index c93e62a87989b2421c17d97c135277c1b02c84c0..abebfa749da1a7bbbd09ecf190258e6fcfa0ae44 100644
--- a/content/browser/gamepad/platform_data_fetcher_win.h
+++ b/content/browser/gamepad/platform_data_fetcher_win.h
@@ -14,6 +14,7 @@
 #include <XInput.h>
 
 #include "base/basictypes.h"
+#include "base/scoped_native_library.h"

[jochen (gone - plz use gerrit), 2012/07/19 14:34:04]

nit. alphabetical order

[scottmg, 2012/07/19 16:45:16]

Done.

 #include "base/compiler_specific.h"
 #include "content/browser/gamepad/data_fetcher.h"
 
@@ -25,8 +26,25 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher {
   virtual void GetGamepadData(WebKit::WebGamepads* pads,
                               bool devices_changed_hint) OVERRIDE;

[jochen (gone - plz use gerrit), 2012/07/19 14:34:04]

virtual destructor missing

[scottmg, 2012/07/19 16:45:16]

Done.

  private:
+  base::ScopedNativeLibrary xinput_dll_;
   bool xinput_available_;
 
+  // The three functions we use from xinput1_3.dll.
+  typedef void (WINAPI *XInputEnableFunc)(BOOL enable);
+  typedef DWORD (WINAPI *XInputGetCapabilitiesFunc)(
+    DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities);
+  typedef DWORD (WINAPI *XInputGetStateFunc)(
+      DWORD dwUserIndex, XINPUT_STATE* pState);
+  XInputEnableFunc xinput_enable_;
+  XInputGetCapabilitiesFunc xinput_get_capabilities_;
+  XInputGetStateFunc xinput_get_state_;
+
+  // Get functions from dynamically loaded xinput1_3.dll. We don't use
+  // DELAYLOAD because the import library for Win8 SDK pulls xinput1_4 which
+  // isn't redistributable. Returns true if loading was successful. We include
+  // xinput1_3.dll with Chrome.
+  bool GetXinputDllFunctions();

[jochen (gone - plz use gerrit), 2012/07/19 14:34:04]

the style guide requires typedefs first, the functions, then data memebers

[scottmg, 2012/07/19 16:45:16]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin);
 };