summaryrefslogtreecommitdiff
path: root/media/base/media_log.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-11-28 11:55:43 +0000
committerTorne (Richard Coles) <torne@google.com>2013-11-28 11:55:43 +0000
commitf2477e01787aa58f445919b809d89e252beef54f (patch)
tree2db962b4af39f0db3a5f83b314373d0530c484b8 /media/base/media_log.cc
parent7daea1dd5ff7e419322de831b642d81af3247912 (diff)
downloadchromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py. Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/base/media_log.cc')
-rw-r--r--media/base/media_log.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index 8a07b020c7..e791b441f4 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -50,6 +50,8 @@ const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) {
return "AUDIO_ENDED";
case MediaLogEvent::VIDEO_ENDED:
return "VIDEO_ENDED";
+ case MediaLogEvent::TEXT_ENDED:
+ return "TEXT_ENDED";
case MediaLogEvent::AUDIO_RENDERER_DISABLED:
return "AUDIO_RENDERER_DISABLED";
case MediaLogEvent::BUFFERED_EXTENTS_CHANGED: