2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9197041..901f3c76 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2163,11 +2163,7 @@ void RenderView::willClose(WebFrame* frame) {
 bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) {
   if (!enabled_per_settings)
     return false;
-  if (!AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS)) {
-    DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
-    return false;
-  }
-  return true;
+  return AllowContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
 }
 
 bool RenderView::allowImages(WebFrame* frame, bool enabled_per_settings) {
@@ -2873,6 +2869,10 @@ void RenderView::didNotAllowScript(WebKit::WebFrame* frame) {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
 
+void RenderView::didNotAllowPlugins(WebKit::WebFrame* frame) {
+  DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS);
+}
+
 void RenderView::didExhaustMemoryAvailableForScript(WebFrame* frame) {
   Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
 }
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 797402f..0248eb2 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -367,6 +367,7 @@ class RenderView : public RenderWidget,
       WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin);
   virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
   virtual void didNotAllowScript(WebKit::WebFrame* frame);
+  virtual void didNotAllowPlugins(WebKit::WebFrame* frame);
   virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame);
   virtual void didCreateScriptContext(WebKit::WebFrame* frame);
   virtual void didDestroyScriptContext(WebKit::WebFrame* frame);