Delegating the "are images allowed" decision to renderer.

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index f29aff3219281b72e34587c6e804747cade727c2..9b1838a12a2cf1c1a606e84b10b195a42d5b8a3b 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -49,15 +49,6 @@ class HostContentSettingsMap
     NUM_PROVIDER_TYPES,
   };
 
-  // TODO(markusheintz): I sold my soul to the devil on order to add this tuple.
-  // I really want my soul back, so I really will change this ASAP.
-  typedef Tuple5<ContentSettingsPattern,
-                 ContentSettingsPattern,
-                 ContentSetting,
-                 std::string,
-                 bool> PatternSettingSourceTuple;
-  typedef std::vector<PatternSettingSourceTuple> SettingsForOneType;
-
   HostContentSettingsMap(PrefService* prefs,
                          ExtensionService* extension_service,
                          bool incognito);
@@ -118,16 +109,13 @@ class HostContentSettingsMap
       const GURL& secondary_url) const;
 
   // For a given content type, returns all patterns with a non-default setting,
-  // mapped to their actual settings, in lexicographical order.  |settings|
-  // must be a non-NULL outparam. If this map was created for the
-  // incognito profile, it will only return those settings differing from
-  // the main map. For ContentSettingsTypes that require an resource identifier
-  // to be specified, the |resource_identifier| must be non-empty.

[Bernhard Bauer, 2011/10/17 13:13:19]

Wait, we're changing the comment without changing the implementation of the
method. Does that mean that the current behavior is already to return all
settings for an incognito HCSM? Does that in turn mean that the content settings
UI is broken?

[marja, 2011/10/17 15:10:11]

The "If the map was created for the incognito profile" part is outdated (after
my CL 7982028). It will return settings for incognito + normal mode in this
case. The UI is not broken, since it will filter the settings based on the
"incognito" bool.

[Bernhard Bauer, 2011/10/17 15:14:13]

Ok, just checking (cs.chromium.org seems to be a bit behind).

+  // mapped to their actual settings, in the order the settings are applied.
+  // |settings| must be a non-NULL outparam.
   //
   // This may be called on any thread.
   void GetSettingsForOneType(ContentSettingsType content_type,
                              const std::string& resource_identifier,
-                             SettingsForOneType* settings) const;
+                             ContentSettingsForOneType* settings) const;
 
   // Sets the default setting for a particular content type. This method must
   // not be invoked on an incognito map.
@@ -231,7 +219,7 @@ class HostContentSettingsMap
       ProviderType provider_type,
       ContentSettingsType content_type,
       const std::string& resource_identifier,
-      SettingsForOneType* settings,
+      ContentSettingsForOneType* settings,
       bool incognito) const;
 
   // Weak; owned by the Profile.