Delegating the "are images allowed" decision to renderer.

chrome/renderer/content_settings_observer.h

 // 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.
 
 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #pragma once
 
 #include <map>
 
 #include "chrome/common/content_settings.h"
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_observer_tracker.h"
 
 class GURL;
 
 namespace WebKit {
 class WebSecurityOrigin;
 }
 
 // Handles blocking content per content settings for each RenderView.
 class ContentSettingsObserver
     : public RenderViewObserver,
       public RenderViewObserverTracker<ContentSettingsObserver> {
  public:
   explicit ContentSettingsObserver(RenderView* render_view);
   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);
 
+  // Sets the content setting rules that back allowImages().
+  static void SetImageSettingRules(const ContentSettingRules& rules);
+
   // Returns the setting for the given type.
   ContentSetting GetContentSetting(ContentSettingsType type);
 
   // Sends an IPC notification that the specified content type was blocked.
   // If the content type requires it, |resource_identifier| names the specific
   // resource that was blocked (the plugin path in the case of plugins),
   // otherwise it's the empty string.
   void DidBlockContentType(ContentSettingsType settings_type,
                            const std::string& resource_identifier);
 
@@ skipping 31 matching lines @@
 
   // Resets the |content_blocked_| array.
   void ClearBlockedContentSettings();
 
   typedef std::map<GURL, ContentSettings> HostContentSettings;
   HostContentSettings host_content_settings_;
 
   // 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.
+  static ContentSettingRules image_setting_rules_;

[Bernhard Bauer, 2011/09/13 17:38:11]

I'd really like to avoid adding even more static initializers (see
http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html
for an example why this is bad).

[marja, 2011/09/15 12:02:00]

I made ChromeContentRendererClient own the image_setting_rules, and
ContentSettingsObserver just to have a pointer to it. Not sure whether that's
the most elegant solution.

+
+  // Stores if loading of scripts, and plugins is allowed.
   ContentSettings current_content_settings_;
 
   // Stores if images, scripts, and plugins have actually been blocked.
   bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
 
   // Caches the result of AllowStorage.
   typedef std::pair<GURL, bool> StoragePermissionsKey;
   std::map<StoragePermissionsKey, bool> cached_storage_permissions_;
 
   bool plugins_temporarily_allowed_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_