Index: content/renderer/gamepad_shared_memory_reader.h |
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h |
index 1fb8f1fb0f82f4aa3e3fe48a1942b5488006dbf9..2eef9d226892cf842fbddc8d232adba11e308beb 100644 |
--- a/content/renderer/gamepad_shared_memory_reader.h |
+++ b/content/renderer/gamepad_shared_memory_reader.h |
@@ -9,22 +9,24 @@ |
#include "base/macros.h" |
#include "base/memory/shared_memory.h" |
-#include "content/common/gamepad_messages.h" |
#include "content/public/renderer/renderer_gamepad_provider.h" |
+#include "device/gamepad/public/interfaces/gamepad.mojom.h" |
+#include "mojo/public/cpp/bindings/binding.h" |
+#include "mojo/public/cpp/system/platform_handle.h" |
#include "third_party/WebKit/public/platform/WebGamepads.h" |
namespace content { |
struct GamepadHardwareBuffer; |
-class GamepadSharedMemoryReader : public RendererGamepadProvider { |
+class GamepadSharedMemoryReader : public RendererGamepadProvider, |
+ public device::mojom::GamepadObserver { |
public: |
explicit GamepadSharedMemoryReader(RenderThread* thread); |
~GamepadSharedMemoryReader() override; |
// RendererGamepadProvider implementation. |
void SampleGamepads(blink::WebGamepads& gamepads) override; |
- bool OnControlMessageReceived(const IPC::Message& message) override; |
void Start(blink::WebPlatformEventListener* listener) override; |
protected: |
@@ -33,8 +35,10 @@ class GamepadSharedMemoryReader : public RendererGamepadProvider { |
void SendStopMessage() override; |
private: |
- void OnGamepadConnected(int index, const blink::WebGamepad& gamepad); |
- void OnGamepadDisconnected(int index, const blink::WebGamepad& gamepad); |
+ // device::mojom::GamepadObserver methods. |
+ void GamepadConnected(int index, const blink::WebGamepad& gamepad) override; |
+ void GamepadDisconnected(int index, |
+ const blink::WebGamepad& gamepad) override; |
base::SharedMemoryHandle renderer_shared_memory_handle_; |
std::unique_ptr<base::SharedMemory> renderer_shared_memory_; |
@@ -42,6 +46,9 @@ class GamepadSharedMemoryReader : public RendererGamepadProvider { |
bool ever_interacted_with_; |
+ mojo::Binding<device::mojom::GamepadObserver> binding_; |
+ device::mojom::GamepadMonitorPtr gamepad_monitor_; |
+ |
DISALLOW_COPY_AND_ASSIGN(GamepadSharedMemoryReader); |
}; |