Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(960)

Unified Diff: content/renderer/gamepad_shared_memory_reader.h

Issue 2522843002: Convert Gamepad IPC messages into mojo interface. (Closed)
Patch Set: code rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/DEPS ('k') | content/renderer/gamepad_shared_memory_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « content/renderer/DEPS ('k') | content/renderer/gamepad_shared_memory_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698