chrome/browser/media/media_internals.cc - Issue 7480032: Plumb media data from renderers up to MediaInternals in the browser process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media/media_internals.cc

Issue 7480032: Plumb media data from renderers up to MediaInternals in the browser process. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Responding to feedback. Created 9 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 | « chrome/browser/media/media_internals.h ('k') | content/browser/renderer_host/media/media_observer.h » ('j') | content/browser/renderer_host/media/media_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_internals.cc

diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc

index bf632817a11c20eea767f93f7f2c53744f86a2bc..ae5e0636f619c00de9fedc3a2fbd41fbfb05b0e1 100644

--- a/chrome/browser/media/media_internals.cc

+++ b/chrome/browser/media/media_internals.cc

@@ -10,6 +10,7 @@

#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_event.h"

// The names of the javascript functions to call with updates.

static const char kDeleteItemFunction[] = "media.onItemDeleted";

@@ -46,6 +47,13 @@ void MediaInternals::OnSetAudioStreamVolume(

"volume", Value::CreateDoubleValue(volume));

}

+void MediaInternals::OnMediaEvent(

+ int source, const media::MediaLogEvent& event) {

+ DCHECK(CalledOnValidThread());

+ // TODO(scottfr): Handle |event|. Record status information in data_ and pass

+ // |event| along to observers.

void MediaInternals::AddObserver(MediaInternalsObserver* observer) {

DCHECK(CalledOnValidThread());

observers_.AddObserver(observer);