Stubs for applying content settings.

R=pkasting
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/555187

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37622 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 1 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 48e5ebf..98c754f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2002,6 +2002,20 @@ void RenderView::willClose(WebFrame* frame) {
   navigation_state->user_script_idle_scheduler()->Cancel();
 }
 
+bool RenderView::allowPlugins(WebFrame* frame, bool enabled_per_settings) {
+  if (!enabled_per_settings)
+    return false;
+  // TODO(darin): Apply policy from content settings.
+  return true;
+}
+
+bool RenderView::allowImages(WebFrame* frame, bool enabled_per_settings) {
+  if (!enabled_per_settings)
+    return false;
+  // TODO(darin): Apply policy from content settings.
+  return true;
+}
+
 void RenderView::loadURLExternally(
     WebFrame* frame, const WebURLRequest& request,
     WebNavigationPolicy policy) {
@@ -2630,8 +2644,10 @@ void RenderView::didRunInsecureContent(
 }
 
 bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {
-  if (enabled_per_settings)
+  if (enabled_per_settings) {
+    // TODO(darin): Apply policy from content settings.
     return true;
+  }
 
   WebSecurityOrigin origin = frame->securityOrigin();
   if (origin.isEmpty())
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 3ca5baa..940b404 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -278,6 +278,8 @@ class RenderView : public RenderWidget,
   virtual WebKit::WebMediaPlayer* createMediaPlayer(
       WebKit::WebFrame* frame, WebKit::WebMediaPlayerClient* client);
   virtual void willClose(WebKit::WebFrame* frame);
+  virtual bool allowPlugins(WebKit::WebFrame* frame, bool enabled_per_settings);
+  virtual bool allowImages(WebKit::WebFrame* frame, bool enabled_per_settings);
   virtual void loadURLExternally(
       WebKit::WebFrame* frame, const WebKit::WebURLRequest& request,
       WebKit::WebNavigationPolicy policy);