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

Unified Diff: media/base/media_log.cc

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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/media_log.h ('k') | media/base/stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_log.cc
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index f5f58de73f47c8a2320fa8a91c067d8c26dc2f98..754a5f924cee03f1dd8476993660f47165aeb199 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -271,20 +271,14 @@ void MediaLog::SetTimeProperty(
AddEvent(event.Pass());
}
-LogHelper::LogHelper(MediaLog::MediaLogLevel level, const LogCB& log_cb)
- : level_(level), log_cb_(log_cb) {
-}
-
LogHelper::LogHelper(MediaLog::MediaLogLevel level,
const scoped_refptr<MediaLog>& media_log)
: level_(level), media_log_(media_log) {
+ DCHECK(media_log_.get());
}
LogHelper::~LogHelper() {
- if (!log_cb_.is_null())
- log_cb_.Run(level_, stream_.str());
- else if (media_log_)
- media_log_->AddLogEvent(level_, stream_.str());
+ media_log_->AddLogEvent(level_, stream_.str());
}
} //namespace media
« no previous file with comments | « media/base/media_log.h ('k') | media/base/stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698