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/location_bar_view.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/location_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/location_bar_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 846ef73..39773b7 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -1333,7 +1333,7 @@ LocationBarView::ContentBlockedImageView::ContentBlockedImageView( info_bubble_(NULL), bubble_positioner_(bubble_positioner) { if (!icons_[CONTENT_SETTINGS_TYPE_COOKIES]) { - static const int kIconIDs[] = { + static const int kIconIDs[CONTENT_SETTINGS_NUM_TYPES] = { IDR_BLOCKED_COOKIES, IDR_BLOCKED_IMAGES, IDR_BLOCKED_JAVASCRIPT, @@ -1348,7 +1348,7 @@ LocationBarView::ContentBlockedImageView::ContentBlockedImageView( } SetImage(icons_[content_type_]); - static const int kTooltipIDs[] = { + static const int kTooltipIDs[CONTENT_SETTINGS_NUM_TYPES] = { IDS_BLOCKED_COOKIES_TITLE, IDS_BLOCKED_IMAGES_TITLE, IDS_BLOCKED_JAVASCRIPT_TITLE, |