Chromium Code Reviews| Index: content/browser/renderer_host/pepper_message_filter.h |
| diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h |
| index 9a0a453cea7a1bb4128bd23ef10757e7494a3ff4..b7c204ec93b9b3332f81471993df5c0304024794 100644 |
| --- a/content/browser/renderer_host/pepper_message_filter.h |
| +++ b/content/browser/renderer_host/pepper_message_filter.h |
| @@ -16,6 +16,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/process.h" |
| #include "base/time.h" |
| +#include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h" |
| #include "content/public/browser/browser_message_filter.h" |
| #include "net/base/network_change_notifier.h" |
| #include "net/base/net_util.h" |
| @@ -23,6 +24,8 @@ |
| #include "net/socket/stream_socket.h" |
| #include "ppapi/c/pp_resource.h" |
| #include "ppapi/c/pp_stdint.h" |
| +#include "ppapi/shared_impl/ppapi_permissions.h" |
|
dmichael (off chromium)
2012/07/09 02:14:46
I don't see this file locally... did you forget t
brettw
2012/07/09 04:41:47
It's in this patch:
http://codereview.chromium.org
|
| +#include "ppapi/host/ppapi_host.h" |
|
dmichael (off chromium)
2012/07/09 02:14:46
nit: include order
|
| class PepperTCPServerSocket; |
| class PepperTCPSocket; |
| @@ -69,7 +72,9 @@ class PepperMessageFilter |
| // Constructor when used in the context of a PPAPI process (the argument is |
| // provided for sanity checking). |
| - PepperMessageFilter(ProcessType type, net::HostResolver* host_resolver); |
| + PepperMessageFilter(ProcessType type, |
| + net::HostResolver* host_resolver, |
| + const ppapi::PpapiPermissions& perms); |
| // content::BrowserMessageFilter methods. |
| virtual void OverrideThreadForMessage( |
| @@ -237,6 +242,11 @@ class PepperMessageFilter |
| // When non-NULL, this should be used instead of the host_resolver_. |
| content::ResourceContext* const resource_context_; |
| + ppapi::PpapiPermissions permissions_; |
| + |
| + content::ContentBrowserPepperHostFactory host_factory_; |
| + ppapi::host::PpapiHost ppapi_host_; |
| + |
| // When non-NULL, this should be used instead of the resource_context_. Use |
| // GetHostResolver instead of accessing directly. |
| net::HostResolver* host_resolver_; |