summaryrefslogtreecommitdiffstats
path: root/webkit/support
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/support
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/support')
-rw-r--r--webkit/support/webkit_support.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index d813165..7183cdb 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -24,6 +24,7 @@
#include "base/utf_string_conversions.h"
#include "base/weak_ptr.h"
#include "grit/webkit_chromium_resources.h"
+#include "media/base/filter_collection.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
@@ -266,8 +267,8 @@ WebPlugin* CreateWebPlugin(WebFrame* frame,
WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
WebMediaPlayerClient* client) {
- scoped_ptr<media::MediaFilterCollection> collection(
- new media::MediaFilterCollection());
+ scoped_ptr<media::FilterCollection> collection(
+ new media::FilterCollection());
// TODO(annacc): do we still need appcache_host? http://crbug.com/65135
// appcache::WebApplicationCacheHostImpl* appcache_host =