Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8424)

Unified Diff: chrome/common/content_settings.h

Issue 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated contentSettings.html. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/content_settings.h
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h
index 4731263f7d15d5a891598d56bac153374421f53d..10a9f428ef032b8a4fad1431aff39e80ddd9d1a7 100644
--- a/chrome/common/content_settings.h
+++ b/chrome/common/content_settings.h
@@ -6,6 +6,10 @@
#define CHROME_COMMON_CONTENT_SETTINGS_H_
#pragma once
+#include <string>
+#include <vector>
+
+#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 +42,20 @@ struct ContentSettings {
ContentSetting settings[CONTENT_SETTINGS_NUM_TYPES];
};
+struct ContentSettingPatternSource {
+ ContentSettingPatternSource(const ContentSettingsPattern& primary_pattern,
+ const ContentSettingsPattern& secondary_patttern,
+ ContentSetting setting,
+ const std::string& source,
+ bool incognito);
+ ContentSettingPatternSource();
+ ContentSettingsPattern primary_pattern;
+ ContentSettingsPattern secondary_pattern;
+ ContentSetting setting;
+ std::string source;
+ bool incognito;
+};
+
+typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
+
#endif // CHROME_COMMON_CONTENT_SETTINGS_H_

Powered by Google App Engine
This is Rietveld 408576698