| 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 b6e6e9e7e46d08d3789a082ddf88d87788a68da4..2bb266ed217900f0e8a5bf4b52d99eddc2eb47ac 100644
|
| --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| @@ -241,19 +241,20 @@ void RendererPpapiHostImpl::SetToExternalPluginHost() {
|
| is_external_plugin_host_ = true;
|
| }
|
|
|
| -void RendererPpapiHostImpl::CreateBrowserResourceHosts(
|
| +int32_t RendererPpapiHostImpl::CreateBrowserResourceHosts(
|
| PP_Instance instance,
|
| const std::vector<IPC::Message>& nested_msgs,
|
| - const base::Callback<void(const std::vector<int>&)>& callback) const {
|
| + const ResourceHostCreationCallback& callback) const {
|
| RenderFrame* render_frame = GetRenderFrameForInstance(instance);
|
| PepperBrowserConnection* browser_connection =
|
| PepperBrowserConnection::Get(render_frame);
|
| if (!browser_connection) {
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(callback, std::vector<int>(nested_msgs.size(), 0)));
|
| + ppapi::proxy::CompletedBrowserResourceHosts empty;
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, empty));
|
| + return -1;
|
| } else {
|
| - browser_connection->SendBrowserCreate(
|
| + return browser_connection->SendBrowserCreate(
|
| module_->GetPluginChildId(), instance, nested_msgs, callback);
|
| }
|
| }
|
|
|