ContentSettings API should not interact with <webview>

chrome/browser/guestview/guestview.cc

Index: chrome/browser/guestview/guestview.cc
diff --git a/chrome/browser/guestview/guestview.cc b/chrome/browser/guestview/guestview.cc
index c125f6e1d332da8fd0907db49af69359d68fbfa0..0501725be95998610beb236cfd864a6d58fb2ae6 100644
--- a/chrome/browser/guestview/guestview.cc
+++ b/chrome/browser/guestview/guestview.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/guestview/guestview_constants.h"
 #include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/content_settings.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
@@ -118,6 +119,38 @@ bool GuestView::GetGuestPartitionConfigForSite(const GURL& site,
   return true;
 }
 
+// static
+void GuestView::GetDefaultContentSettingRules(
+    RendererContentSettingRules* rules) {
+  rules->image_rules.clear();
+  rules->image_rules.push_back(ContentSettingPatternSource(
+    ContentSettingsPattern::Wildcard(),
+    ContentSettingsPattern::Wildcard(),
+    CONTENT_SETTING_ALLOW,
+    "default",
+    false));

[jochen (gone - plz use gerrit), 2013/12/03 08:55:21]

please add incongito as parameter instead of creating the rules twice

[Fady Samuel, 2013/12/03 15:31:27]

Done.

+  rules->image_rules.push_back(ContentSettingPatternSource(
+    ContentSettingsPattern::Wildcard(),
+    ContentSettingsPattern::Wildcard(),
+    CONTENT_SETTING_ALLOW,
+    "default",
+    true));
+
+  rules->script_rules.clear();
+  rules->script_rules.push_back(ContentSettingPatternSource(
+    ContentSettingsPattern::Wildcard(),
+    ContentSettingsPattern::Wildcard(),
+    CONTENT_SETTING_ALLOW,
+    std::string(),
+    false));
+  rules->script_rules.push_back(ContentSettingPatternSource(
+    ContentSettingsPattern::Wildcard(),
+    ContentSettingsPattern::Wildcard(),
+    CONTENT_SETTING_ALLOW,
+    std::string(),
+    true));
+}
+
 void GuestView::Attach(content::WebContents* embedder_web_contents,
                        const base::DictionaryValue& args) {
   embedder_web_contents_ = embedder_web_contents;