diff options
author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 19:08:32 +0000 |
---|---|---|
committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 19:08:32 +0000 |
commit | 1cf786aad88dbf7a4f4565f5c5288cdd160d1f16 (patch) | |
tree | 17b8452fe27a4b1e197a3fd32e4314b7b4c6d5e0 /chrome/common/content_settings.h | |
parent | 042e95f1309e6bd8dc77d4bce184d9aa2f5f6619 (diff) | |
download | chromium_src-1cf786aad88dbf7a4f4565f5c5288cdd160d1f16.zip chromium_src-1cf786aad88dbf7a4f4565f5c5288cdd160d1f16.tar.gz chromium_src-1cf786aad88dbf7a4f4565f5c5288cdd160d1f16.tar.bz2 |
Lock the GTK UI of the content settings bubble if the corresponding content settings type is managed.
BUG=98029
TEST=HostContentSettingsMap*
Review URL: http://codereview.chromium.org/8493013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/content_settings.h')
-rw-r--r-- | chrome/common/content_settings.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h index 2c7e5c2..ec500b6 100644 --- a/chrome/common/content_settings.h +++ b/chrome/common/content_settings.h @@ -13,7 +13,7 @@ #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. +// give the user the ability to set these on a global and per-origin basis. enum ContentSetting { CONTENT_SETTING_DEFAULT = 0, CONTENT_SETTING_ALLOW, @@ -51,4 +51,29 @@ struct ContentSettingPatternSource { typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType; +namespace content_settings { + +// Enum containing the various source for content settings. Settings can be +// set by policy, extension or the user. Certain (internal) schemes are +// whilelisted. For whilelisted schemes the source is +// |SETTING_SOURCE_WHITELIST|. +enum SettingSource { + SETTING_SOURCE_NONE, + SETTING_SOURCE_POLICY, + SETTING_SOURCE_EXTENSION, + SETTING_SOURCE_USER, + SETTING_SOURCE_WHITELIST, +}; + +// |SettingInfo| provides meta data for content setting values. |source| +// contains the source of a value. |primary_pattern| and |secondary_pattern| +// contains the patterns of the appling rule. +struct SettingInfo { + SettingSource source; + ContentSettingsPattern primary_pattern; + ContentSettingsPattern secondary_pattern; +}; + +} // namespace content_settings + #endif // CHROME_COMMON_CONTENT_SETTINGS_H_ |