diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 10:02:16 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 10:02:16 +0000 |
| commit | ceb98432ad0891542fb213193dd8312aed41e3c6 (patch) | |
| tree | 9372263ed8c7e045ad7226f44f28079a75661a46 /chrome/common/content_settings.h | |
| parent | f85f070f8fca83ca373929584218d7185ff89220 (diff) | |
| download | chromium_src-ceb98432ad0891542fb213193dd8312aed41e3c6.zip chromium_src-ceb98432ad0891542fb213193dd8312aed41e3c6.tar.gz chromium_src-ceb98432ad0891542fb213193dd8312aed41e3c6.tar.bz2 | |
Hook up some of the content settings UI to the actual settings map object. This also rewrites the affected UI bits to make it easier to do this, get rid of unnecessary code, and be more consistent with the blocked content bubble code.
BUG=32719
TEST=Content settings windows now have radio buttons that work, and remember their settings. The Flash link works too.
Review URL: http://codereview.chromium.org/558060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/content_settings.h')
| -rw-r--r-- | chrome/common/content_settings.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h index 59d58c8..3e798b3 100644 --- a/chrome/common/content_settings.h +++ b/chrome/common/content_settings.h @@ -10,8 +10,7 @@ // 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_FIRST_SETTING = 0, - CONTENT_SETTING_DEFAULT = CONTENT_SETTING_FIRST_SETTING, + CONTENT_SETTING_DEFAULT = 0, CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, CONTENT_SETTING_ASK, @@ -21,8 +20,7 @@ enum ContentSetting { // Aggregates the permissions for the different content types. struct ContentSettings { ContentSettings() { - for (int i = CONTENT_SETTINGS_FIRST_TYPE; i < CONTENT_SETTINGS_NUM_TYPES; - ++i) + for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) settings[i] = CONTENT_SETTING_DEFAULT; } |