| Index: third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h
|
| diff --git a/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h b/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h
|
| index df091606e817f2cfe62c41c509424f69a66d4a61..3311e1d2e02c96133d3cbfd1ebba18f1cbccf1d7 100644
|
| --- a/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h
|
| +++ b/third_party/WebKit/Source/modules/gamepad/GamepadDispatcher.h
|
| @@ -6,14 +6,12 @@
|
| #define GamepadDispatcher_h
|
|
|
| #include "core/frame/PlatformEventDispatcher.h"
|
| +#include "device/gamepad/public/cpp/gamepads.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "public/platform/WebGamepad.h"
|
| #include "public/platform/WebGamepadListener.h"
|
|
|
| namespace blink {
|
|
|
| -class WebGamepads;
|
| -
|
| class GamepadDispatcher final
|
| : public GarbageCollectedFinalized<GamepadDispatcher>,
|
| public PlatformEventDispatcher,
|
| @@ -24,11 +22,11 @@ class GamepadDispatcher final
|
| static GamepadDispatcher& Instance();
|
| ~GamepadDispatcher() override;
|
|
|
| - void SampleGamepads(WebGamepads&);
|
| + void SampleGamepads(device::Gamepads&);
|
|
|
| struct ConnectionChange {
|
| DISALLOW_NEW();
|
| - WebGamepad pad;
|
| + device::Gamepad pad;
|
| unsigned index;
|
| };
|
|
|
| @@ -42,15 +40,15 @@ class GamepadDispatcher final
|
| GamepadDispatcher();
|
|
|
| // WebGamepadListener
|
| - void DidConnectGamepad(unsigned index, const WebGamepad&) override;
|
| - void DidDisconnectGamepad(unsigned index, const WebGamepad&) override;
|
| + void DidConnectGamepad(unsigned index, const device::Gamepad&) override;
|
| + void DidDisconnectGamepad(unsigned index, const device::Gamepad&) override;
|
|
|
| // PlatformEventDispatcher
|
| void StartListening() override;
|
| void StopListening() override;
|
|
|
| void DispatchDidConnectOrDisconnectGamepad(unsigned index,
|
| - const WebGamepad&,
|
| + const device::Gamepad&,
|
| bool connected);
|
|
|
| ConnectionChange latest_change_;
|
|
|