Index: content/renderer/pepper/pepper_plugin_instance_impl.cc |
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
index 8a1ad19dc5d4346912b88848a3898899c9d02186..49b044957cb467de4cfd387a264730b30bce1a50 100644 |
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc |
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
@@ -41,6 +41,7 @@ |
#include "content/renderer/pepper/ppb_buffer_impl.h" |
#include "content/renderer/pepper/ppb_graphics_3d_impl.h" |
#include "content/renderer/pepper/ppb_image_data_impl.h" |
+#include "content/renderer/pepper/ppb_uma_private_impl.h" |
#include "content/renderer/pepper/ppp_pdf.h" |
#include "content/renderer/pepper/renderer_ppapi_host_impl.h" |
#include "content/renderer/pepper/url_request_info_util.h" |
@@ -67,6 +68,7 @@ |
#include "ppapi/c/private/ppp_instance_private.h" |
#include "ppapi/host/ppapi_host.h" |
#include "ppapi/proxy/ppapi_messages.h" |
+#include "ppapi/proxy/uma_private_resource.h" |
#include "ppapi/proxy/url_loader_resource.h" |
#include "ppapi/shared_impl/ppapi_permissions.h" |
#include "ppapi/shared_impl/ppapi_preferences.h" |
@@ -506,6 +508,7 @@ PepperPluginInstanceImpl::PepperPluginInstanceImpl( |
checked_for_plugin_messaging_interface_(false), |
checked_for_plugin_pdf_interface_(false), |
gamepad_impl_(new GamepadImpl()), |
+ uma_private_impl_(NULL), |
plugin_print_interface_(NULL), |
plugin_graphics_3d_interface_(NULL), |
always_on_top_(false), |
@@ -2386,6 +2389,17 @@ ppapi::Resource* PepperPluginInstanceImpl::GetSingletonResource( |
return NULL; |
case ppapi::GAMEPAD_SINGLETON_ID: |
return gamepad_impl_.get(); |
+ case ppapi::UMA_SINGLETON_ID: { |
+ if (!uma_private_impl_) { |
+ RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host(); |
+ if (host_impl->in_process_router()) { |
+ uma_private_impl_ = new ppapi::proxy::UMAPrivateResource( |
+ host_impl->in_process_router()->GetPluginConnection(instance), |
+ instance); |
+ } |
+ } |
+ return uma_private_impl_.get(); |
+ } |
} |
NOTREACHED(); |