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

Unified Diff: content/browser/renderer_host/pepper/browser_ppapi_host_impl.h

Issue 10824272: Add a skeleton gamepad resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 4 months 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
Index: content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
index 2bedbdab583f56c3033674f8c0bb4b9854f40095..062755a398b8c3401e9c132bb068c6455a76dbbd 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
#include "content/public/browser/browser_ppapi_host.h"
-#include "ipc/ipc_listener.h"
+#include "ipc/ipc_channel_proxy.h"
#include "ppapi/host/ppapi_host.h"
namespace IPC {
@@ -18,19 +18,21 @@ class Sender;
namespace content {
-class BrowserPpapiHostImpl : public BrowserPpapiHost, public IPC::Listener {
+class BrowserPpapiHostImpl : public BrowserPpapiHost,
+ public IPC::ChannelProxy::MessageFilter {
public:
BrowserPpapiHostImpl(IPC::Sender* sender,
const ppapi::PpapiPermissions& permissions);
- virtual ~BrowserPpapiHostImpl();
- // IPC::Listener.
+ // IPC::ChannelProxy::MessageFilter.
virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
// BrowserPpapiHost.
virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE;
private:
+ virtual ~BrowserPpapiHostImpl();
+
ContentBrowserPepperHostFactory host_factory_;
ppapi::host::PpapiHost ppapi_host_;

Powered by Google App Engine
This is Rietveld 408576698