Make MediaInternals handle MediaLogEvents.

chrome/browser/media/media_internals.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_internals.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/media/media_internals_observer.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/webui/web_ui.h"
+#include "media/base/media_log.h"
 #include "media/base/media_log_event.h"
 
 // The names of the javascript functions to call with updates.
+static const char kAudioUpdateFunction[] = "media.addAudioStream";
 static const char kDeleteItemFunction[] = "media.onItemDeleted";
-static const char kAudioUpdateFunction[] = "media.addAudioStream";
+static const char kMediaEventFunction[] = "media.onMediaEvent";
 static const char kSendEverythingFunction[] = "media.onReceiveEverything";
 
 MediaInternals::~MediaInternals() {}
 
 void MediaInternals::OnDeleteAudioStream(void* host, int stream_id) {
   DCHECK(CalledOnValidThread());
   std::string stream = base::StringPrintf("audio_streams.%p:%d",
                                           host, stream_id);
   DeleteItem(stream);
 }
@@ skipping 15 matching lines @@
 void MediaInternals::OnSetAudioStreamVolume(
     void* host, int stream_id, double volume) {
   DCHECK(CalledOnValidThread());
   UpdateAudioStream(host, stream_id,
                     "volume", Value::CreateDoubleValue(volume));
 }
 
 void MediaInternals::OnMediaEvent(
     int render_process_id, const media::MediaLogEvent& event) {
   DCHECK(CalledOnValidThread());
-  // TODO(scottfr): Handle |event|. Record status information in data_ and pass
-  //                |event| along to observers.
+
+  // Notify observers that |event| has occured.
+  DictionaryValue dict;
+  dict.SetInteger("renderer", render_process_id);
+  dict.SetInteger("player", event.id);
+  dict.SetString("type", media::MediaLog::EventTypeToString(event.type));
+  dict.SetDouble("time", event.time.ToDoubleT());
+  dict.Set("params", event.params.DeepCopy());
+  SendUpdate(kMediaEventFunction, &dict);
 }
 
 void MediaInternals::AddObserver(MediaInternalsObserver* observer) {
   DCHECK(CalledOnValidThread());
   observers_.AddObserver(observer);
 }
 
 void MediaInternals::RemoveObserver(MediaInternalsObserver* observer) {
   DCHECK(CalledOnValidThread());
   observers_.RemoveObserver(observer);
@@ skipping 34 matching lines @@
 
 void MediaInternals::SendUpdate(const std::string& function, Value* value) {
   // Only bother serializing the update to JSON if someone is watching.
   if (observers_.size()) {
     std::vector<const Value*> args;
     args.push_back(value);
     string16 update = WebUI::GetJavascriptCall(function, args);
     FOR_EACH_OBSERVER(MediaInternalsObserver, observers_, OnUpdate(update));
   }
 }