Replace IDR_WEB_UI_CLOSE* with IDR_CLOSE_DIALOG*, cleanup, etc.

chrome/browser/ui/views/confirm_bubble_views.cc

Index: chrome/browser/ui/views/confirm_bubble_views.cc
diff --git a/chrome/browser/ui/views/confirm_bubble_views.cc b/chrome/browser/ui/views/confirm_bubble_views.cc
index f51a2d916b00a337a5d8980e3ae4e8afdd805d23..63d07fe3848ee6b77348ed3ffd330addacbe712e 100644
--- a/chrome/browser/ui/views/confirm_bubble_views.cc
+++ b/chrome/browser/ui/views/confirm_bubble_views.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/ui/confirm_bubble.h"
 #include "chrome/browser/ui/confirm_bubble_model.h"
-#include "grit/theme_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
@@ -84,9 +84,12 @@ void ConfirmBubbleViews::Init() {
   layout->AddView(title_label);
 
   views::ImageButton* close_button = new views::ImageButton(this);
-  const gfx::ImageSkia* close_image =
-      bundle.GetImageNamed(IDR_WEB_UI_CLOSE).ToImageSkia();
-  close_button->SetImage(views::CustomButton::STATE_NORMAL, close_image);
+  close_button->SetImage(views::CustomButton::STATE_NORMAL,
+       bundle.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());

[tfarina, 2013/01/10 19:32:48]

can you use GetImageSkiaNamed directly here?

[msw, 2013/01/10 19:59:49]

Done.

+  close_button->SetImage(views::CustomButton::STATE_HOVERED,
+       bundle.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
+  close_button->SetImage(views::CustomButton::STATE_PRESSED,
+       bundle.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
   close_button->set_tag(ConfirmBubbleModel::BUTTON_NONE);
   layout->AddView(close_button);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);