Replace IDR_WEB_UI_CLOSE* with IDR_CLOSE_DIALOG*, cleanup, etc.

chrome/browser/ui/views/confirm_bubble_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/confirm_bubble_views.h"
 
 #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"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ skipping 57 matching lines @@
   icon_view->SetImage(icon_image->ToImageSkia());
   layout->AddView(icon_view);
 
   const string16 title_text = model_->GetTitle();
   DCHECK(!title_text.empty());
   views::Label* title_label = new views::Label(title_text);
   title_label->SetFont(bundle.GetFont(ui::ResourceBundle::MediumFont));
   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);
 
   // Add the message label to the second row.
   cs = layout->AddColumnSet(1);
   const string16 message_text = model_->GetMessageText();
   DCHECK(!message_text.empty());
   views::Label* message_label = new views::Label(message_text);
   int message_width =
@@ skipping 55 matching lines @@
 
 void ShowConfirmBubble(gfx::NativeView view,
                        const gfx::Point& origin,
                        ConfirmBubbleModel* model) {
   ConfirmBubbleViews* bubble = new ConfirmBubbleViews(origin, model);
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->Show();
 }
 
 }  // namespace chrome