Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7776)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/render_view.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Forgotten to upload the mergeconflict resolutions (trybots happiness aplies to this upload). Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm ('k') | webkit/plugins/npapi/plugin_group.h » ('j') | webkit/plugins/npapi/plugin_list.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a81aae07fa3e458d6c2c592b9be186b104fcc09a..dce67c401affacfbe409feeb1021e1ce31df3cae 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -920,7 +920,7 @@ WebPlugin* RenderView::CreatePluginNoCheck(WebFrame* frame,
Send(new ViewHostMsg_GetPluginInfo(
params.url, frame->top()->url(), params.mimeType.utf8(), &found,
&info, &setting, &mime_type));
- if (!found || !info.enabled)
+ if (!found || !webkit::npapi::IsPluginEnabled(info))
return NULL;
scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
@@ -2716,7 +2716,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
false);
}
- if (!info.enabled)
+ if (!webkit::npapi::IsPluginEnabled(info))
return NULL;
ContentSetting host_setting =
« no previous file with comments | « chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm ('k') | webkit/plugins/npapi/plugin_group.h » ('j') | webkit/plugins/npapi/plugin_list.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698