Index: content/shell/renderer/test_runner/gamepad_controller.cc |
diff --git a/content/shell/renderer/test_runner/gamepad_controller.cc b/content/shell/renderer/test_runner/gamepad_controller.cc |
index 8c4eedf47bce4f6526d3fd7a77bb646d76e1910d..ff334028f8abd1f8491e0d17cf6201bfd0138524 100644 |
--- a/content/shell/renderer/test_runner/gamepad_controller.cc |
+++ b/content/shell/renderer/test_runner/gamepad_controller.cc |
@@ -138,7 +138,7 @@ void GamepadControllerBindings::SetAxisData(int index, int axis, double data) { |
} |
GamepadController::GamepadController() |
- : listener_(NULL), |
+ : RendererGamepadProvider(0), |
weak_factory_(this) { |
Reset(); |
} |
@@ -163,9 +163,14 @@ void GamepadController::SampleGamepads(blink::WebGamepads& gamepads) { |
memcpy(&gamepads, &gamepads_, sizeof(blink::WebGamepads)); |
} |
-void GamepadController::SetGamepadListener( |
- blink::WebGamepadListener* listener) { |
- listener_ = listener; |
+bool GamepadController::OnControlMessageReceived(const IPC::Message& msg) { |
+ return false; |
+} |
+ |
+void GamepadController::SendStartMessage() { |
+} |
+ |
+void GamepadController::SendStopMessage() { |
} |
void GamepadController::Connect(int index) { |
@@ -184,8 +189,8 @@ void GamepadController::DispatchConnected(int index) { |
|| !gamepads_.items[index].connected) |
return; |
const WebGamepad& pad = gamepads_.items[index]; |
- if (listener_) |
- listener_->didConnectGamepad(index, pad); |
+ if (listener()) |
+ listener()->didConnectGamepad(index, pad); |
} |
void GamepadController::Disconnect(int index) { |
@@ -198,8 +203,8 @@ void GamepadController::Disconnect(int index) { |
if (gamepads_.items[i].connected) |
gamepads_.length = i + 1; |
} |
- if (listener_) |
- listener_->didDisconnectGamepad(index, pad); |
+ if (listener()) |
+ listener()->didDisconnectGamepad(index, pad); |
} |
void GamepadController::SetId(int index, const std::string& src) { |