| Index: content/renderer/pepper/content_renderer_pepper_host_factory.cc
|
| diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
|
| index de7cf7577f532fd7c1453a0ddcd6bf1cb9643bcb..bd1488bf48eec865e531dd58012f4a4e080dbc24 100644
|
| --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
|
| +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
|
|
|
| +#include "content/renderer/pepper/content_instance_glue.h"
|
| +#include "content/renderer/pepper/pepper_file_chooser_host.h"
|
| #include "ppapi/host/resource_host.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
|
|
| @@ -12,8 +14,12 @@ using ppapi::host::ResourceHost;
|
| namespace content {
|
|
|
| ContentRendererPepperHostFactory::ContentRendererPepperHostFactory(
|
| - RenderViewImpl* render_view)
|
| - : render_view_(render_view) {
|
| + RenderViewImpl* render_view,
|
| + const ppapi::PpapiPermissions& permissions,
|
| + ContentInstanceGlue* glue)
|
| + : render_view_(render_view),
|
| + permissions_(permissions),
|
| + instance_glue_(glue) {
|
| }
|
|
|
| ContentRendererPepperHostFactory::~ContentRendererPepperHostFactory() {
|
| @@ -24,7 +30,20 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost(
|
| const ppapi::proxy::ResourceMessageCallParams& params,
|
| PP_Instance instance,
|
| const IPC::Message& message) {
|
| - // TODO(brettw) host creation goes here.
|
| + // Make sure the plugin is giving us a valid instance for this resource.
|
| + if (!instance_glue_->IsValidInstance(instance))
|
| + return scoped_ptr<ResourceHost>();
|
| +
|
| + // Resources for dev interfaces.
|
| + // TODO(brettw) when we support any public or private interfaces, put them in
|
| + // a separate switch above.
|
| + if (permissions_.HasPermission(ppapi::PERMISSION_DEV)) {
|
| + switch (message.type()) {
|
| + case PpapiHostMsg_FileChooser_Create::ID:
|
| + return scoped_ptr<ResourceHost>(new PepperFileChooserHost(
|
| + host, instance, params.pp_resource(), render_view_, instance_glue_));
|
| + }
|
| + }
|
| return scoped_ptr<ResourceHost>();
|
| }
|
|
|
|
|