| Index: content/browser/gamepad/gamepad_platform_data_fetcher.h
|
| diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher.h b/content/browser/gamepad/gamepad_platform_data_fetcher.h
|
| index c2eec157d31aab86bd17bf5e04b6bedb18f75030..d2dc8b73d767517f8940620186d8a6fe7f4c2640 100644
|
| --- a/content/browser/gamepad/gamepad_platform_data_fetcher.h
|
| +++ b/content/browser/gamepad/gamepad_platform_data_fetcher.h
|
| @@ -10,52 +10,52 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/gamepad/gamepad_data_fetcher.h"
|
| -#include "content/browser/gamepad/gamepad_provider.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h"
|
| #elif defined(OS_WIN)
|
| #include "content/browser/gamepad/gamepad_platform_data_fetcher_win.h"
|
| -#include "content/browser/gamepad/raw_input_data_fetcher_win.h"
|
| #elif defined(OS_MACOSX)
|
| #include "content/browser/gamepad/gamepad_platform_data_fetcher_mac.h"
|
| -#include "content/browser/gamepad/xbox_data_fetcher_mac.h"
|
| #elif defined(OS_LINUX)
|
| #include "content/browser/gamepad/gamepad_platform_data_fetcher_linux.h"
|
| #endif
|
|
|
| namespace content {
|
|
|
| -void AddGamepadPlatformDataFetchers(GamepadProvider* provider) {
|
| #if defined(OS_ANDROID)
|
|
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new GamepadPlatformDataFetcherAndroid()));
|
| +typedef GamepadPlatformDataFetcherAndroid GamepadPlatformDataFetcher;
|
|
|
| #elif defined(OS_WIN)
|
|
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new GamepadPlatformDataFetcherWin()));
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new RawInputDataFetcher()));
|
| +typedef GamepadPlatformDataFetcherWin GamepadPlatformDataFetcher;
|
|
|
| #elif defined(OS_MACOSX)
|
|
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new GamepadPlatformDataFetcherMac()));
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new XboxDataFetcher()));
|
| +typedef GamepadPlatformDataFetcherMac GamepadPlatformDataFetcher;
|
|
|
| #elif defined(OS_LINUX) && defined(USE_UDEV)
|
|
|
| - provider->AddGamepadDataFetcher(scoped_ptr<GamepadDataFetcher>(
|
| - new GamepadPlatformDataFetcherLinux()));
|
| +typedef GamepadPlatformDataFetcherLinux GamepadPlatformDataFetcher;
|
| +
|
| +#else
|
| +
|
| +class GamepadDataFetcherEmpty : public GamepadDataFetcher {
|
| + public:
|
| + GamepadDataFetcherEmpty();
|
| +
|
| + void GetGamepadData(blink::WebGamepads* pads,
|
| + bool devices_changed_hint) override;
|
| +
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(GamepadDataFetcherEmpty);
|
| +};
|
| +typedef GamepadDataFetcherEmpty GamepadPlatformDataFetcher;
|
|
|
| #endif
|
| -}
|
|
|
| } // namespace content
|
|
|
|
|