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

3 files changed, 9 insertions, 9 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,
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,
diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index bb61d7c..4be6291 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -49,7 +49,7 @@ void ContentFilterPageView::InitControlLayout() {
                         GridLayout::USE_PREF, 0, 0);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  static const int kTitleIDs[] = {
+  static const int kTitleIDs[CONTENT_SETTINGS_NUM_TYPES] = {
     0,  // This dialog isn't used for cookies.
     IDS_IMAGES_SETTING_LABEL,
     IDS_JS_SETTING_LABEL,
@@ -67,7 +67,7 @@ void ContentFilterPageView::InitControlLayout() {
   layout->AddView(title_label);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  static const int kAllowIDs[] = {
+  static const int kAllowIDs[CONTENT_SETTINGS_NUM_TYPES] = {
     0,  // This dialog isn't used for cookies.
     IDS_IMAGES_LOAD_RADIO,
     IDS_JS_ALLOW_RADIO,
@@ -82,7 +82,7 @@ void ContentFilterPageView::InitControlLayout() {
   allow_radio_->set_listener(this);
   allow_radio_->SetMultiLine(true);
 
-  static const int kBlockIDs[] = {
+  static const int kBlockIDs[CONTENT_SETTINGS_NUM_TYPES] = {
     0,  // This dialog isn't used for cookies.
     IDS_IMAGES_NOLOAD_RADIO,
     IDS_JS_DONOTALLOW_RADIO,