Index: content/renderer/gamepad_shared_memory_reader.cc |
diff --git a/content/renderer/gamepad_shared_memory_reader.cc b/content/renderer/gamepad_shared_memory_reader.cc |
index 1e34ea1307c0d0c7f33b37d22f1c62b041b87533..cfa756fec4f872d40bb0b91a6c05842547447002 100644 |
--- a/content/renderer/gamepad_shared_memory_reader.cc |
+++ b/content/renderer/gamepad_shared_memory_reader.cc |
@@ -60,7 +60,7 @@ void GamepadSharedMemoryReader::Start( |
static_cast<GamepadHardwareBuffer*>(memory); |
} |
-void GamepadSharedMemoryReader::SampleGamepads(blink::WebGamepads& gamepads) { |
+void GamepadSharedMemoryReader::SampleGamepads(device::Gamepads& gamepads) { |
// Blink should have started observing at that point. |
CHECK(is_observing()); |
@@ -70,7 +70,7 @@ void GamepadSharedMemoryReader::SampleGamepads(blink::WebGamepads& gamepads) { |
// |
// This logic is duplicated in Pepper as well. If you change it, that also |
// needs to be in sync. See ppapi/proxy/gamepad_resource.cc. |
- blink::WebGamepads read_into; |
+ device::Gamepads read_into; |
TRACE_EVENT0("GAMEPAD", "SampleGamepads"); |
if (!renderer_shared_buffer_handle_.is_valid()) |
@@ -107,7 +107,7 @@ void GamepadSharedMemoryReader::SampleGamepads(blink::WebGamepads& gamepads) { |
// gamepads to prevent fingerprinting. The actual data is not cleared. |
// WebKit will only copy out data into the JS buffers for connected |
// gamepads so this is sufficient. |
- for (unsigned i = 0; i < blink::WebGamepads::kItemsLengthCap; i++) |
+ for (unsigned i = 0; i < device::Gamepads::kItemsLengthCap; i++) |
gamepads.items[i].connected = false; |
} |
} |
@@ -118,7 +118,7 @@ GamepadSharedMemoryReader::~GamepadSharedMemoryReader() { |
void GamepadSharedMemoryReader::GamepadConnected( |
int index, |
- const blink::WebGamepad& gamepad) { |
+ const device::Gamepad& gamepad) { |
// The browser already checks if the user actually interacted with a device. |
ever_interacted_with_ = true; |
@@ -128,7 +128,7 @@ void GamepadSharedMemoryReader::GamepadConnected( |
void GamepadSharedMemoryReader::GamepadDisconnected( |
int index, |
- const blink::WebGamepad& gamepad) { |
+ const device::Gamepad& gamepad) { |
if (listener()) |
listener()->DidDisconnectGamepad(index, gamepad); |
} |