Index: device/gamepad/gamepad_platform_data_fetcher_win.h |
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h b/device/gamepad/gamepad_platform_data_fetcher_win.h |
similarity index 75% |
rename from content/browser/gamepad/gamepad_platform_data_fetcher_win.h |
rename to device/gamepad/gamepad_platform_data_fetcher_win.h |
index 4fbd1cf0ce7f23c2483e51a7153a86dee5fbb4ae..cf9f7728a8716d31279e6e69b0b58cf2930377d4 100644 |
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h |
+++ b/device/gamepad/gamepad_platform_data_fetcher_win.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |
-#define CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |
+#ifndef DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |
+#define DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |
#include <memory> |
@@ -12,23 +12,23 @@ |
#ifndef WIN32_LEAN_AND_MEAN |
#define WIN32_LEAN_AND_MEAN |
#endif |
-#include <stdlib.h> |
#include <Unknwn.h> |
#include <WinDef.h> |
-#include <windows.h> |
#include <XInput.h> |
+#include <stdlib.h> |
+#include <windows.h> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/scoped_native_library.h" |
-#include "content/browser/gamepad/gamepad_data_fetcher.h" |
-#include "content/browser/gamepad/gamepad_standard_mappings.h" |
-#include "content/browser/gamepad/raw_input_data_fetcher_win.h" |
+#include "device/gamepad/gamepad_data_fetcher.h" |
+#include "device/gamepad/gamepad_standard_mappings.h" |
+#include "device/gamepad/raw_input_data_fetcher_win.h" |
#include "third_party/WebKit/public/platform/WebGamepads.h" |
-namespace content { |
+namespace device { |
class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { |
public: |
@@ -44,11 +44,13 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { |
bool devices_changed_hint); |
// The three function types 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); |
+ 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); |
// Get functions from dynamically loading the xinput dll. |
// Returns true if loading was successful. |
@@ -82,7 +84,7 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { |
struct PlatformPadState { |
PadConnectionStatus status; |
- int xinput_index; // XInput-only |
+ int xinput_index; // XInput-only |
HANDLE raw_input_handle; // RawInput-only fields. |
}; |
PlatformPadState platform_pad_state_[blink::WebGamepads::itemsLengthCap]; |
@@ -92,6 +94,6 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { |
DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin); |
}; |
-} // namespace content |
+} // namespace device |
-#endif // CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |
+#endif // DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_WIN_H_ |