summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:27:49 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 00:27:49 +0000
commitf8db8138e0bf38e223af520e721f1b18c2338586 (patch)
treefed715fb20dd16998c16ca54b4c7da7ae94372f1 /webkit/glue/webmediaplayer_impl.cc
parent1937df51d1bdcabbad5523243108d4bba40a1695 (diff)
downloadchromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.zip
chromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.tar.gz
chromium_src-f8db8138e0bf38e223af520e721f1b18c2338586.tar.bz2
Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5527003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 19e4b2a..830a1942 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "base/command_line.h"
+#include "media/base/filter_collection.h"
#include "media/base/limits.h"
#include "media/base/media_format.h"
#include "media/base/media_switches.h"
@@ -225,7 +226,7 @@ void WebMediaPlayerImpl::Proxy::PutCurrentFrame(
WebMediaPlayerImpl::WebMediaPlayerImpl(
WebKit::WebMediaPlayerClient* client,
- media::MediaFilterCollection* collection)
+ media::FilterCollection* collection)
: network_state_(WebKit::WebMediaPlayer::Empty),
ready_state_(WebKit::WebMediaPlayer::HaveNothing),
main_loop_(NULL),