diff options
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.cc | 16 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.h | 10 |
2 files changed, 9 insertions, 17 deletions
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index a8a652f..9b33329 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -107,7 +107,6 @@ void WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin) IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply, OnHandleURLRequestReply) - IPC_MESSAGE_HANDLER(PluginMsg_URLRequestRouted, OnURLRequestRouted) IPC_MESSAGE_UNHANDLED_ERROR() IPC_END_MESSAGE_MAP() @@ -214,8 +213,9 @@ void WebPluginDelegateStub::OnDidFail(int id) { client->DidFail(); } -void WebPluginDelegateStub::OnDidFinishLoadWithReason(int reason) { - delegate_->DidFinishLoadWithReason(reason); +void WebPluginDelegateStub::OnDidFinishLoadWithReason( + const GURL& url, int reason, intptr_t notify_data) { + delegate_->DidFinishLoadWithReason(url, reason, notify_data); } void WebPluginDelegateStub::OnSetFocus() { @@ -299,8 +299,8 @@ void WebPluginDelegateStub::OnGetPluginScriptableObject(int* route_id, WebBindings::releaseObject(object); } -void WebPluginDelegateStub::OnSendJavaScriptStream(const std::string& url, - const std::wstring& result, +void WebPluginDelegateStub::OnSendJavaScriptStream(const GURL& url, + const std::string& result, bool success, bool notify_needed, intptr_t notify_data) { @@ -374,9 +374,3 @@ void WebPluginDelegateStub::OnHandleURLRequestReply( params.stream); webplugin_->OnResourceCreated(params.resource_id, resource_client); } - -void WebPluginDelegateStub::OnURLRequestRouted(const std::string& url, - bool notify_needed, - intptr_t notify_data) { - delegate_->URLRequestRouted(url, notify_needed, notify_data); -} diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h index e385156..d0c6542 100644 --- a/chrome/plugin/webplugin_delegate_stub.h +++ b/chrome/plugin/webplugin_delegate_stub.h @@ -58,7 +58,8 @@ class WebPluginDelegateStub : public IPC::Channel::Listener, void OnDidFinishLoading(int id); void OnDidFail(int id); - void OnDidFinishLoadWithReason(int reason); + void OnDidFinishLoadWithReason(const GURL& url, int reason, + intptr_t notify_data); void OnSetFocus(); void OnHandleInputEvent(const WebKit::WebInputEvent* event, bool* handled, WebCursor* cursor); @@ -73,8 +74,8 @@ class WebPluginDelegateStub : public IPC::Channel::Listener, const TransportDIB::Handle& windowless_buffer, const TransportDIB::Handle& background_buffer); void OnGetPluginScriptableObject(int* route_id, intptr_t* npobject_ptr); - void OnSendJavaScriptStream(const std::string& url, - const std::wstring& result, + void OnSendJavaScriptStream(const GURL& url, + const std::string& result, bool success, bool notify_needed, intptr_t notify_data); @@ -89,9 +90,6 @@ class WebPluginDelegateStub : public IPC::Channel::Listener, void OnHandleURLRequestReply( const PluginMsg_URLRequestReply_Params& params); - void OnURLRequestRouted(const std::string& url, bool notify_needed, - intptr_t notify_data); - void CreateSharedBuffer(size_t size, base::SharedMemory* shared_buf, base::SharedMemoryHandle* remote_handle); |