diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 06:50:08 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 06:50:08 +0000 |
| commit | 20a793eb518ccc6503f6521e0ebc806e8e686a06 (patch) | |
| tree | 60f5ad1a91f7f0be1767afa7938a23cc84f12eed /webkit/support/webkit_support.cc | |
| parent | efd7ab46d727bad8ca7cf08f83b16f0ada6d9375 (diff) | |
| download | chromium_src-20a793eb518ccc6503f6521e0ebc806e8e686a06.zip chromium_src-20a793eb518ccc6503f6521e0ebc806e8e686a06.tar.gz chromium_src-20a793eb518ccc6503f6521e0ebc806e8e686a06.tar.bz2 | |
This changes GetPluginInfo so that we can request a list of plugins that match the criterion (mime type/url) instead of just the first one that matches.
This is in preparation for implementing a way for us to switch which flash plugin we select based on a whitelist of domains.
BUG=http://crosbug.com/7403
TEST=ran chrome unit_tests, ran chromeos version of chrome, passed trybots.
Review URL: http://codereview.chromium.org/3530017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/webkit_support.cc')
| -rw-r--r-- | webkit/support/webkit_support.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index e9c516a..f0e3f85 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -256,9 +256,6 @@ WebPlugin* CreateWebPlugin(WebFrame* frame, return NULL; } - if (actual_mime_type.empty()) - actual_mime_type = params.mimeType.utf8(); - return new WebPluginImplWithPageDelegate( frame, params, info.path, actual_mime_type); } |