Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Unified Diff: content/child/npapi/plugin_stream.cc

Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/child/npapi/plugin_stream.cc
diff --git a/content/child/npapi/plugin_stream.cc b/content/child/npapi/plugin_stream.cc
index 282f69b1f736d73a119359a86afface7a8553c09..454086386672d469b311b5325946a8ed40216239 100644
--- a/content/child/npapi/plugin_stream.cc
+++ b/content/child/npapi/plugin_stream.cc
@@ -24,12 +24,8 @@ namespace content {
PluginStream::PluginStream(
PluginInstance* instance,
- const char* url,
- bool need_notify,
- void* notify_data)
+ const char* url)
: instance_(instance),
- notify_needed_(need_notify),
- notify_data_(notify_data),
close_on_write_data_(false),
requested_plugin_mode_(NP_NORMAL),
opened_(false),
@@ -58,7 +54,6 @@ bool PluginStream::Open(const std::string& mime_type,
stream_.lastmodified = last_modified;
stream_.pdata = 0;
stream_.ndata = id->ndata;
- stream_.notifyData = notify_data_;
if (!headers_.empty())
stream_.headers = headers_.c_str();
@@ -87,10 +82,8 @@ bool PluginStream::Open(const std::string& mime_type,
NPError err = instance_->NPP_NewStream((NPMIMEType)char_mime_type,
&stream_, seekable_stream,
&requested_plugin_mode_);
- if (err != NPERR_NO_ERROR) {
- Notify(err);
+ if (err != NPERR_NO_ERROR)
return false;
- }
opened_ = true;
@@ -258,8 +251,6 @@ bool PluginStream::Close(NPReason reason) {
DCHECK(err == NPERR_NO_ERROR);
}
}
-
- Notify(reason);
return true;
}
@@ -267,13 +258,6 @@ WebPluginResourceClient* PluginStream::AsResourceClient() {
return NULL;
}
-void PluginStream::Notify(NPReason reason) {
- if (notify_needed_) {
- instance_->NPP_URLNotify(stream_.url, reason, notify_data_);
- notify_needed_ = false;
- }
-}
-
bool PluginStream::RequestedPluginModeIsAsFile() const {
return (requested_plugin_mode_ == NP_ASFILE ||
requested_plugin_mode_ == NP_ASFILEONLY);

Powered by Google App Engine
This is Rietveld 408576698