diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 06:18:37 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 06:18:37 +0000 |
| commit | 6a7c000f9841e3011d428ddc94b15a3fa2904325 (patch) | |
| tree | fe554260384d56ced6701984f7d3f17760141f74 /content/browser/plugin_service_impl.cc | |
| parent | 62e90ae37c58bf070ebd16752af9bd32f92ab47e (diff) | |
| download | chromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.zip chromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.tar.gz chromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.tar.bz2 | |
Revert 180600
> Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/
>
> BUG=172573
> Review URL: https://codereview.chromium.org/12177018
Windows and aura bots are failing, and this is the only CL
in range that had no passing try runs for those tests.
If the bots don't go green, I'll unrevert the revert.
TBR=cevans@chromium.org
Review URL: https://codereview.chromium.org/12210009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.cc')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 7079828..101fcf4 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -489,12 +489,12 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id, *is_stale = stale; for (size_t i = 0; i < plugins.size(); ++i) { - if (!filter_ || filter_->IsPluginAvailable(render_process_id, - render_view_id, - context, - url, - page_url, - &plugins[i])) { + if (!filter_ || filter_->IsPluginEnabled(render_process_id, + render_view_id, + context, + url, + page_url, + &plugins[i])) { *info = plugins[i]; if (actual_mime_type) *actual_mime_type = mime_types[i]; |