Chromium Code Reviews| Index: content/shell/renderer/test_runner/gamepad_controller.h |
| diff --git a/content/shell/renderer/test_runner/gamepad_controller.h b/content/shell/renderer/test_runner/gamepad_controller.h |
| index b648fd08be275f79fe3ae1695c2f28520eb40edc..6cfd01873183a11aea73a8dfab9080fafaf691e6 100644 |
| --- a/content/shell/renderer/test_runner/gamepad_controller.h |
| +++ b/content/shell/renderer/test_runner/gamepad_controller.h |
| @@ -5,26 +5,36 @@ |
| #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_GAMEPAD_CONTROLLER_H_ |
| #define CONTENT_SHELL_RENDERER_TEST_RUNNER_GAMEPAD_CONTROLLER_H_ |
| +#include <map> |
| + |
| #include "base/memory/weak_ptr.h" |
| +#include "content/public/renderer/renderer_gamepad_provider.h" |
| #include "third_party/WebKit/public/platform/WebGamepads.h" |
| namespace blink { |
| class WebFrame; |
| +class WebGamepadListener; |
| } |
| namespace content { |
| class WebTestDelegate; |
| -class GamepadController : public base::SupportsWeakPtr<GamepadController> { |
| +class GamepadController |
| + : public base::SupportsWeakPtr<GamepadController> |
| + , public RendererGamepadProvider { |
|
jam
2014/06/18 23:23:42
nit: use google style comma on previous line)
|
| public: |
| GamepadController(); |
| - ~GamepadController(); |
| + virtual ~GamepadController(); |
| void Reset(); |
| void Install(blink::WebFrame* frame); |
| void SetDelegate(WebTestDelegate* delegate); |
| + // RendererGamepadProvider implementation. |
| + virtual void SampleGamepads(blink::WebGamepads& gamepads); |
| + virtual void SetGamepadListener(blink::WebGamepadListener*); |
|
jam
2014/06/18 23:23:42
nit: google style is to put the parameter name her
|
| + |
| private: |
| friend class GamepadControllerBindings; |
| @@ -46,7 +56,10 @@ class GamepadController : public base::SupportsWeakPtr<GamepadController> { |
| blink::WebGamepads gamepads_; |
| - WebTestDelegate* delegate_; |
| + blink::WebGamepadListener* listener_; |
| + |
| + // Mapping from gamepad index to connection state. |
| + std::map<int, bool> pending_changes_; |
| base::WeakPtrFactory<GamepadController> weak_factory_; |