Index: content/child/npapi/webplugin_delegate_impl.cc |
diff --git a/content/child/npapi/webplugin_delegate_impl.cc b/content/child/npapi/webplugin_delegate_impl.cc |
index 18149c378bf94231c02136e880bfacb95b160c10..e115cab0540a1ec244050d6a3f7f868de901d8ea 100644 |
--- a/content/child/npapi/webplugin_delegate_impl.cc |
+++ b/content/child/npapi/webplugin_delegate_impl.cc |
@@ -193,18 +193,6 @@ bool WebPluginDelegateImpl::GetFormValue(base::string16* value) { |
return instance_->GetFormValue(value); |
} |
-void WebPluginDelegateImpl::DidFinishLoadWithReason(const GURL& url, |
- NPReason reason, |
- int notify_id) { |
- if (quirks_ & PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS && |
- reason == NPRES_NETWORK_ERR) { |
- // Flash needs this or otherwise it unloads the launching swf object. |
- reason = NPRES_DONE; |
- } |
- |
- instance()->DidFinishLoadWithReason(url, reason, notify_id); |
-} |
- |
int WebPluginDelegateImpl::GetProcessId() { |
// We are in process, so the plugin pid is this current process pid. |
return base::GetCurrentProcId(); |
@@ -212,9 +200,8 @@ int WebPluginDelegateImpl::GetProcessId() { |
void WebPluginDelegateImpl::SendJavaScriptStream(const GURL& url, |
const std::string& result, |
- bool success, |
- int notify_id) { |
- instance()->SendJavaScriptStream(url, result, success, notify_id); |
+ bool success) { |
+ instance()->SendJavaScriptStream(url, result, success); |
} |
void WebPluginDelegateImpl::DidReceiveManualResponse( |
@@ -290,9 +277,9 @@ bool WebPluginDelegateImpl::IsUserGesture(const WebInputEvent& event) { |
} |
WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient( |
- unsigned long resource_id, const GURL& url, int notify_id) { |
+ unsigned long resource_id, const GURL& url) { |
return instance()->CreateStream( |
- resource_id, url, std::string(), notify_id); |
+ resource_id, url, std::string()); |
} |
WebPluginResourceClient* WebPluginDelegateImpl::CreateSeekableResourceClient( |
@@ -305,7 +292,6 @@ WebPluginResourceClient* WebPluginDelegateImpl::CreateSeekableResourceClient( |
} |
void WebPluginDelegateImpl::FetchURL(unsigned long resource_id, |
- int notify_id, |
const GURL& url, |
const GURL& first_party_for_cookies, |
const std::string& method, |
@@ -320,7 +306,7 @@ void WebPluginDelegateImpl::FetchURL(unsigned long resource_id, |
// TODO(jam): once we switch over to resource loading always happening in this |
// code path, remove WebPluginResourceClient abstraction. |
PluginStreamUrl* plugin_stream = instance()->CreateStream( |
- resource_id, url, std::string(), notify_id); |
+ resource_id, url, std::string()); |
bool copy_stream_data = !!(quirks_ & PLUGIN_QUIRK_COPY_STREAM_DATA); |
plugin_stream->SetPluginURLFetcher(new PluginURLFetcher( |