Delegating the "are images allowed" decision to renderer.

chrome/common/content_settings.h

 // Copyright (c) 2010 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_COMMON_CONTENT_SETTINGS_H_
 #define CHROME_COMMON_CONTENT_SETTINGS_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
+#include "base/tuple.h"
+
+#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_types.h"
 
 // Different settings that can be assigned for a particular content type.  We
 // give the user the ability to set these on a global and per-host basis.
 enum ContentSetting {
   CONTENT_SETTING_DEFAULT = 0,
   CONTENT_SETTING_ALLOW,
   CONTENT_SETTING_BLOCK,
   CONTENT_SETTING_ASK,
   CONTENT_SETTING_SESSION_ONLY,
@@ skipping 12 matching lines @@
   }
 
   explicit ContentSettings(ContentSetting default_setting) {
     for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i)
       settings[i] = default_setting;
   }
 
   ContentSetting settings[CONTENT_SETTINGS_NUM_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.

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

If we're moving the definition, now might be a good time to change it to a
struct?

[marja, 2011/10/18 12:23:02]

Done.

+typedef Tuple5<ContentSettingsPattern,
+               ContentSettingsPattern,
+               ContentSetting,
+               std::string,
+               bool> ContentSettingPatternSourceTuple;
+typedef std::vector<ContentSettingPatternSourceTuple> ContentSettingsForOneType;
+
 #endif  // CHROME_COMMON_CONTENT_SETTINGS_H_