Delegating the "are images allowed" decision to renderer.

chrome/renderer/content_settings_observer.h

Index: chrome/renderer/content_settings_observer.h
diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
index d28deb8be5899eda6df73c289ea613ec8499fa8c..f31a416eb1f8ea581fe500234b81e98d6fc6a0c0 100644
--- a/chrome/renderer/content_settings_observer.h
+++ b/chrome/renderer/content_settings_observer.h
@@ -23,15 +23,15 @@ class ContentSettingsObserver
     : public RenderViewObserver,
       public RenderViewObserverTracker<ContentSettingsObserver> {
  public:
-  explicit ContentSettingsObserver(RenderView* render_view);
+  explicit ContentSettingsObserver(RenderView* render_view,
+                                   ContentSettingRules* image_setting_rules);
   virtual ~ContentSettingsObserver();
 
-  // Sets the content settings that back allowScripts(), allowImages(), and
-  // allowPlugins().
+  // Sets the content settings that back allowScripts(), and allowPlugins().
   void SetContentSettings(const ContentSettings& settings);
 
-  // Sets the default content settings that back allowScripts(),
-  // allowImages(), and allowPlugins().
+  // Sets the default content settings that back allowScripts(), and
+  // allowPlugins().
   static void SetDefaultContentSettings(const ContentSettings& settings);
 
   // Returns the setting for the given type.
@@ -85,7 +85,10 @@ class ContentSettingsObserver
   // Stores our most up-to-date view of the default content settings.
   static ContentSettings default_settings_;
 
-  // Stores if loading of images, scripts, and plugins is allowed.
+  // Stores the rules for image content settings. Not owned.

[Bernhard Bauer, 2011/09/15 12:52:19]

Can you explain who owns them? And maybe make the pointer const?

[marja, 2011/09/15 16:00:03]

Done.

+  ContentSettingRules* image_setting_rules_;
+
+  // Stores if loading of scripts, and plugins is allowed.
   ContentSettings current_content_settings_;
 
   // Stores if images, scripts, and plugins have actually been blocked.