diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 00:50:34 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 00:50:34 +0000 |
| commit | df4a64075f123113902a97a03cd00a8c9ba05aea (patch) | |
| tree | b0e1b64e0f0afc470c9ebabf8eb98d78bbd3672f /chrome/browser/media | |
| parent | dabaf655b51cd1ffb254f8abf79d5551f8dbb178 (diff) | |
| download | chromium_src-df4a64075f123113902a97a03cd00a8c9ba05aea.zip chromium_src-df4a64075f123113902a97a03cd00a8c9ba05aea.tar.gz chromium_src-df4a64075f123113902a97a03cd00a8c9ba05aea.tar.bz2 | |
Revert 95542 - Plumb media data from renderers up to MediaInternals in the browser process.
BUG=none
TEST=manually
Review URL: http://codereview.chromium.org/7480032
TBR=scottfr@chromium.org
Review URL: http://codereview.chromium.org/7566054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media')
| -rw-r--r-- | chrome/browser/media/DEPS | 3 | ||||
| -rw-r--r-- | chrome/browser/media/media_internals.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/media/media_internals.h | 6 |
3 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/media/DEPS b/chrome/browser/media/DEPS deleted file mode 100644 index cc5cd70..0000000 --- a/chrome/browser/media/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+media/base", -] diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc index a563db3..bf63281 100644 --- a/chrome/browser/media/media_internals.cc +++ b/chrome/browser/media/media_internals.cc @@ -10,7 +10,6 @@ #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"; @@ -47,13 +46,6 @@ void MediaInternals::OnSetAudioStreamVolume( "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. -} - void MediaInternals::AddObserver(MediaInternalsObserver* observer) { DCHECK(CalledOnValidThread()); observers_.AddObserver(observer); diff --git a/chrome/browser/media/media_internals.h b/chrome/browser/media/media_internals.h index a5b62e1..c0d276e 100644 --- a/chrome/browser/media/media_internals.h +++ b/chrome/browser/media/media_internals.h @@ -14,10 +14,6 @@ class MediaInternalsObserver; -namespace media { -struct MediaLogEvent; -} - // This class stores information about currently active media. // All of its methods are called on the IO thread. class MediaInternals : public MediaObserver, public base::NonThreadSafe { @@ -30,8 +26,6 @@ class MediaInternals : public MediaObserver, public base::NonThreadSafe { virtual void OnSetAudioStreamStatus(void* host, int stream_id, const std::string& status); virtual void OnSetAudioStreamVolume(void* host, int stream_id, double volume); - virtual void OnMediaEvent(int render_process_id, - const media::MediaLogEvent& event); // Methods for observers. // Observers should add themselves on construction and remove themselves |