| 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 99b7efc285598a6b40cbcd3b1caa5e5e8ef9e726..ece04120e2104b504b094f8fe30c648aee98d8ec 100644
|
| --- a/content/shell/renderer/test_runner/gamepad_controller.h
|
| +++ b/content/shell/renderer/test_runner/gamepad_controller.h
|
| @@ -24,21 +24,22 @@ class GamepadController
|
| : public base::SupportsWeakPtr<GamepadController>,
|
| public RendererGamepadProvider {
|
| public:
|
| - GamepadController();
|
| + static base::WeakPtr<GamepadController> Create(WebTestDelegate* delegate);
|
| virtual ~GamepadController();
|
|
|
| void Reset();
|
| void Install(blink::WebFrame* frame);
|
| - void SetDelegate(WebTestDelegate* delegate);
|
|
|
| // RendererGamepadProvider implementation.
|
| virtual void SampleGamepads(
|
| blink::WebGamepads& gamepads) OVERRIDE;
|
| - virtual void SetGamepadListener(
|
| - blink::WebGamepadListener* listener) OVERRIDE;
|
| + virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| + virtual void SendStartMessage() OVERRIDE;
|
| + virtual void SendStopMessage() OVERRIDE;
|
|
|
| private:
|
| friend class GamepadControllerBindings;
|
| + GamepadController();
|
|
|
| // TODO(b.kelemen): for historical reasons Connect just initializes the
|
| // object. The 'gamepadconnected' event will be dispatched via
|
| @@ -58,8 +59,6 @@ class GamepadController
|
|
|
| blink::WebGamepads gamepads_;
|
|
|
| - blink::WebGamepadListener* listener_;
|
| -
|
| // Mapping from gamepad index to connection state.
|
| std::map<int, bool> pending_changes_;
|
|
|
|
|