Index: content/browser/renderer_host/gamepad_browser_message_filter.h |
diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.h b/content/browser/renderer_host/gamepad_browser_message_filter.h |
index 8661e71d7dc7ec010f454a71d5419dff817e6099..23fefd16395f9ce9a5f05e42e7ceb043a875f14e 100644 |
--- a/content/browser/renderer_host/gamepad_browser_message_filter.h |
+++ b/content/browser/renderer_host/gamepad_browser_message_filter.h |
@@ -7,6 +7,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/shared_memory.h" |
+#include "content/browser/gamepad/gamepad_consumer.h" |
#include "content/public/browser/browser_message_filter.h" |
namespace content { |
@@ -14,14 +15,23 @@ namespace content { |
class GamepadService; |
class RenderProcessHost; |
-class GamepadBrowserMessageFilter : public BrowserMessageFilter { |
+class GamepadBrowserMessageFilter : |
+ public BrowserMessageFilter, |
+ public GamepadConsumer { |
public: |
- GamepadBrowserMessageFilter(); |
+ explicit GamepadBrowserMessageFilter(); |
jam
2014/05/05 21:19:09
nit: undo this
|
// BrowserMessageFilter implementation. |
virtual bool OnMessageReceived(const IPC::Message& message, |
bool* message_was_ok) OVERRIDE; |
+ virtual void OnGamepadConnected( |
jam
2014/05/05 21:19:09
nit: convention is to start this section with "//
|
+ unsigned index, |
+ const blink::WebGamepad& web_gamepad) OVERRIDE; |
+ virtual void OnGamepadDisconnected( |
+ unsigned index, |
+ const blink::WebGamepad& web_gamepad) OVERRIDE; |
+ |
private: |
virtual ~GamepadBrowserMessageFilter(); |