Index: content/renderer/pepper/renderer_ppapi_host_impl.cc |
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc |
index 22e7f46f3622564cc62abc03d83cdf2e82601b69..850399addb282cd265b73c53cc5e9a19cdbd9737 100644 |
--- a/content/renderer/pepper/renderer_ppapi_host_impl.cc |
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc |
@@ -41,7 +41,9 @@ RendererPpapiHostImpl::RendererPpapiHostImpl( |
PluginModule* module, |
ppapi::proxy::HostDispatcher* dispatcher, |
const ppapi::PpapiPermissions& permissions) |
- : module_(module), dispatcher_(dispatcher) { |
+ : module_(module), |
+ dispatcher_(dispatcher), |
+ is_external_plugin_host_(false) { |
// Hook the PpapiHost up to the dispatcher for out-of-process communication. |
ppapi_host_.reset(new ppapi::host::PpapiHost(dispatcher, permissions)); |
ppapi_host_->AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>( |
@@ -54,7 +56,7 @@ RendererPpapiHostImpl::RendererPpapiHostImpl( |
RendererPpapiHostImpl::RendererPpapiHostImpl( |
PluginModule* module, |
const ppapi::PpapiPermissions& permissions) |
- : module_(module), dispatcher_(NULL) { |
+ : module_(module), dispatcher_(NULL), is_external_plugin_host_(false) { |
// Hook the host up to the in-process router. |
in_process_router_.reset(new PepperInProcessRouter(this)); |
ppapi_host_.reset(new ppapi::host::PpapiHost( |
@@ -125,6 +127,10 @@ PepperPluginInstanceImpl* RendererPpapiHostImpl::GetPluginInstanceImpl( |
return GetAndValidateInstance(instance); |
} |
+bool RendererPpapiHostImpl::IsExternalPluginHost() const { |
+ return is_external_plugin_host_; |
+} |
+ |
ppapi::host::PpapiHost* RendererPpapiHostImpl::GetPpapiHost() { |
return ppapi_host_.get(); |
} |
@@ -227,6 +233,14 @@ bool RendererPpapiHostImpl::IsRunningInProcess() const { |
return is_running_in_process_; |
} |
+std::string RendererPpapiHostImpl::GetPluginName() const { |
+ return module_->name(); |
+} |
+ |
+void RendererPpapiHostImpl::SetToExternalPluginHost() { |
+ is_external_plugin_host_ = true; |
+} |
+ |
void RendererPpapiHostImpl::CreateBrowserResourceHosts( |
PP_Instance instance, |
const std::vector<IPC::Message>& nested_msgs, |