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

Unified Diff: media/base/composite_data_source_factory.cc

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 years, 9 months 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
« no previous file with comments | « media/base/async_filter_factory_base.cc ('k') | media/base/composite_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/composite_data_source_factory.cc
diff --git a/media/base/composite_data_source_factory.cc b/media/base/composite_data_source_factory.cc
index 84b525918be6cbdef9371001ab7977c77e3d378b..7b5c573a6ceff416bd33bb5fddf399407989b1ba 100644
--- a/media/base/composite_data_source_factory.cc
+++ b/media/base/composite_data_source_factory.cc
@@ -24,7 +24,7 @@ class CompositeDataSourceFactory::BuildRequest
private:
void CallNextFactory();
- void OnBuildDone(PipelineError error, DataSource* data_source);
+ void OnBuildDone(PipelineStatus status, DataSource* data_source);
FactoryList factories_;
};
@@ -87,22 +87,22 @@ void CompositeDataSourceFactory::BuildRequest::CallNextFactory() {
}
void CompositeDataSourceFactory::BuildRequest::OnBuildDone(
- PipelineError error,
+ PipelineStatus status,
DataSource* data_source) {
- if (error == PIPELINE_OK) {
+ if (status == PIPELINE_OK) {
DCHECK(data_source);
- RequestComplete(error, data_source);
+ RequestComplete(status, data_source);
return;
}
DCHECK(!data_source);
- if ((error == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) {
+ if ((status == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) {
CallNextFactory();
return;
}
- RequestComplete(error, data_source);
+ RequestComplete(status, data_source);
}
} // namespace media
« no previous file with comments | « media/base/async_filter_factory_base.cc ('k') | media/base/composite_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698