Index: content/browser/renderer_host/pepper/pepper_gamepad_host.h |
diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h |
index 1db73aa694a5ebbfba38f200bc2b84cc268f0a3e..b4dc8c7dea1a3e5dc0621e64b0a7b6c611fe0595 100644 |
--- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h |
+++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h |
@@ -7,6 +7,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/weak_ptr.h" |
+#include "content/browser/gamepad/gamepad_consumer.h" |
#include "content/common/content_export.h" |
#include "ppapi/host/resource_host.h" |
@@ -21,7 +22,9 @@ namespace content { |
class BrowserPpapiHost; |
class GamepadService; |
-class CONTENT_EXPORT PepperGamepadHost : public ppapi::host::ResourceHost { |
+class CONTENT_EXPORT PepperGamepadHost : |
+ public ppapi::host::ResourceHost, |
+ public GamepadConsumer { |
jam
2014/05/05 21:19:09
so you derived from this but don't need to impleme
kbalazs
2014/05/06 22:20:34
It needs to derive because GamepadService now hold
|
public: |
PepperGamepadHost(BrowserPpapiHost* host, |
PP_Instance instance, |