Take script URLs into account when applying script content settings.

chrome/browser/content_settings/content_settings_utils.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/content_settings_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
+#include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 // The names of the ContentSettingsType values, for use with dictionary prefs.
 const char* kTypeNames[] = {
   "cookies",
   "images",
   "javascript",
   "plugins",
@@ skipping 158 matching lines @@
                                  ContentSettingsType content_type,
                                  const std::string& resource_identifier,
                                  bool include_incognito) {
   scoped_ptr<base::Value> value(
       GetContentSettingValue(provider, primary_url, secondary_url,
                              content_type, resource_identifier,
                              include_incognito));
   return ValueToContentSetting(value.get());
 }
 
+void SendContentSettingRules(const HostContentSettingsMap* map,
+                             IPC::Channel::Sender* sender) {
+  RendererContentSettingRules rules;
+  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "",
+                             &(rules.image_rules));
+  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "",
+                             &(rules.script_rules));
+  sender->Send(new ChromeViewMsg_SetContentSettingRules(rules));

[Bernhard Bauer, 2011/11/03 22:18:38]

Could you change this method so that it populates a RendererContentSettingRules
struct from the HostContentSettingsMap, and have the |Send| method in clients
instead?

[marja, 2011/11/07 09:32:48]

Done.

+}
+
 }  // namespace content_settings