Delegating the "are images allowed" decision to renderer.

chrome/common/content_settings.h

Index: chrome/common/content_settings.h
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h
index 4731263f7d15d5a891598d56bac153374421f53d..0a071af1b344a406bd58c4c17e8aef316ae7fe0a 100644
--- a/chrome/common/content_settings.h
+++ b/chrome/common/content_settings.h
@@ -6,6 +6,12 @@
 #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
@@ -38,4 +44,13 @@ struct ContentSettings {
   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_