diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-31 00:36:23 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-31 00:36:23 +0000 |
| commit | 3d1b7c7ba93735d06d39e439fa84585029a8d2a0 (patch) | |
| tree | 2612a07afccfcbe7fe4d8448306c3d921ec067d7 /chrome/browser/views/content_blocked_bubble_contents.cc | |
| parent | 71d6e77d7dfb71c8db3430e16f1777fb33ee2681 (diff) | |
| download | chromium_src-3d1b7c7ba93735d06d39e439fa84585029a8d2a0.zip chromium_src-3d1b7c7ba93735d06d39e439fa84585029a8d2a0.tar.gz chromium_src-3d1b7c7ba93735d06d39e439fa84585029a8d2a0.tar.bz2 | |
Fix some bugs related to default-clearing in the HostContentSettingsMap, and clean up various other bits.
This also adds some functionality useful to the Exceptions dialogs.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/557074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/content_blocked_bubble_contents.cc')
| -rw-r--r-- | chrome/browser/views/content_blocked_bubble_contents.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/content_blocked_bubble_contents.cc b/chrome/browser/views/content_blocked_bubble_contents.cc index 4ba0b34..82c9eca 100644 --- a/chrome/browser/views/content_blocked_bubble_contents.cc +++ b/chrome/browser/views/content_blocked_bubble_contents.cc @@ -85,7 +85,7 @@ void ContentBlockedBubbleContents::InitControlLayout() { column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1, GridLayout::USE_PREF, 0, 0); - static const int kTitleIDs[] = { + static const int kTitleIDs[CONTENT_SETTINGS_NUM_TYPES] = { IDS_BLOCKED_COOKIES_TITLE, IDS_BLOCKED_IMAGES_TITLE, IDS_BLOCKED_JAVASCRIPT_TITLE, @@ -119,7 +119,7 @@ void ContentBlockedBubbleContents::InitControlLayout() { } if (content_type_ != CONTENT_SETTINGS_TYPE_COOKIES) { - static const int kAllowIDs[] = { + static const int kAllowIDs[CONTENT_SETTINGS_NUM_TYPES] = { 0, // Not displayed for cookies IDS_BLOCKED_IMAGES_UNBLOCK, IDS_BLOCKED_JAVASCRIPT_UNBLOCK, @@ -134,7 +134,7 @@ void ContentBlockedBubbleContents::InitControlLayout() { radio_button_group); allow_radio_->set_listener(this); - static const int kBlockIDs[] = { + static const int kBlockIDs[CONTENT_SETTINGS_NUM_TYPES] = { 0, // Not displayed for cookies IDS_BLOCKED_IMAGES_NO_ACTION, IDS_BLOCKED_JAVASCRIPT_NO_ACTION, @@ -172,7 +172,7 @@ void ContentBlockedBubbleContents::InitControlLayout() { double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); - static const int kLinkIDs[] = { + static const int kLinkIDs[CONTENT_SETTINGS_NUM_TYPES] = { IDS_BLOCKED_COOKIES_LINK, IDS_BLOCKED_IMAGES_LINK, IDS_BLOCKED_JAVASCRIPT_LINK, |