Delegating the "are images allowed" decision to renderer.

chrome/browser/content_settings/host_content_settings_map.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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #pragma once
@@ skipping 31 matching lines @@
       public base::RefCountedThreadSafe<HostContentSettingsMap> {
  public:
   enum ProviderType {
     POLICY_PROVIDER = 0,
     EXTENSION_PROVIDER = 1,
     PREF_PROVIDER,
     DEFAULT_PROVIDER,
     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);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the default setting for a particular content type.
   //
   // This may be called on any thread.
   ContentSetting GetDefaultContentSetting(
@@ skipping 40 matching lines @@
   // Returns all ContentSettings which apply to the given URLs. For content
   // setting types that require an additional resource identifier, the default
   // content setting is returned.
   //
   // This may be called on any thread.
   ContentSettings GetContentSettings(
       const GURL& primary_url,
       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.
   //
   // This should only be called on the UI thread.
   void SetDefaultContentSetting(ContentSettingsType content_type,
                                 ContentSetting setting);
 
   // Sets the content setting for the given patterns and content type.
   // Setting the value to CONTENT_SETTING_DEFAULT causes the default setting
@@ skipping 83 matching lines @@
   // Adds content settings for |content_type| and |resource_identifier|,
   // provided by |provider|, into |settings|. If |incognito| is true, adds only
   // the content settings which are applicable to the incognito mode and differ
   // from the normal mode. Otherwise, adds the content settings for the normal
   // mode.
   void AddSettingsForOneType(
       const content_settings::ProviderInterface* provider,
       ProviderType provider_type,
       ContentSettingsType content_type,
       const std::string& resource_identifier,
-      SettingsForOneType* settings,
+      ContentSettingsForOneType* settings,
       bool incognito) const;
 
   // Weak; owned by the Profile.
   PrefService* prefs_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   // Content setting providers.
   ProviderMap content_settings_providers_;
 
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
   // Misc global settings.
   bool block_third_party_cookies_;
   bool is_block_third_party_cookies_managed_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_