| Index: content/plugin/webplugin_delegate_stub.cc
|
| diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
|
| index 8d4587d8cbeb18db0707874d7dbe5b6b95f0d517..549e4b1b4b321dbebb72ade11c97afa407b9e9b1 100644
|
| --- a/content/plugin/webplugin_delegate_stub.cc
|
| +++ b/content/plugin/webplugin_delegate_stub.cc
|
| @@ -99,8 +99,6 @@ bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
|
| IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveData, OnDidReceiveData)
|
| IPC_MESSAGE_HANDLER(PluginMsg_DidFinishLoading, OnDidFinishLoading)
|
| IPC_MESSAGE_HANDLER(PluginMsg_DidFail, OnDidFail)
|
| - IPC_MESSAGE_HANDLER(PluginMsg_DidFinishLoadWithReason,
|
| - OnDidFinishLoadWithReason)
|
| IPC_MESSAGE_HANDLER(PluginMsg_SetFocus, OnSetFocus)
|
| IPC_MESSAGE_HANDLER(PluginMsg_HandleInputEvent, OnHandleInputEvent)
|
| IPC_MESSAGE_HANDLER(PluginMsg_Paint, OnPaint)
|
| @@ -247,11 +245,6 @@ void WebPluginDelegateStub::OnDidFail(int id) {
|
| client->DidFail(id);
|
| }
|
|
|
| -void WebPluginDelegateStub::OnDidFinishLoadWithReason(
|
| - const GURL& url, int reason, int notify_id) {
|
| - delegate_->DidFinishLoadWithReason(url, reason, notify_id);
|
| -}
|
| -
|
| void WebPluginDelegateStub::OnSetFocus(bool focused) {
|
| delegate_->SetFocus(focused);
|
| #if defined(OS_WIN) && !defined(USE_AURA)
|
| @@ -315,9 +308,8 @@ void WebPluginDelegateStub::OnGetFormValue(base::string16* value,
|
|
|
| void WebPluginDelegateStub::OnSendJavaScriptStream(const GURL& url,
|
| const std::string& result,
|
| - bool success,
|
| - int notify_id) {
|
| - delegate_->SendJavaScriptStream(url, result, success, notify_id);
|
| + bool success) {
|
| + delegate_->SendJavaScriptStream(url, result, success);
|
| }
|
|
|
| void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
|
| @@ -400,9 +392,9 @@ void WebPluginDelegateStub::OnDidManualLoadFail() {
|
| }
|
|
|
| void WebPluginDelegateStub::OnHandleURLRequestReply(
|
| - unsigned long resource_id, const GURL& url, int notify_id) {
|
| + unsigned long resource_id, const GURL& url) {
|
| WebPluginResourceClient* resource_client =
|
| - delegate_->CreateResourceClient(resource_id, url, notify_id);
|
| + delegate_->CreateResourceClient(resource_id, url);
|
| webplugin_->OnResourceCreated(resource_id, resource_client);
|
| }
|
|
|
| @@ -420,7 +412,6 @@ void WebPluginDelegateStub::OnFetchURL(
|
| data = ¶ms.post_data[0];
|
|
|
| delegate_->FetchURL(params.resource_id,
|
| - params.notify_id,
|
| params.url,
|
| params.first_party_for_cookies,
|
| params.method,
|
|
|