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 28 matching lines @@
 
 void ConfirmBubbleViews::LinkClicked(views::Link* source, int event_flags) {
   model_->LinkClicked();
 }
 
 gfx::Rect ConfirmBubbleViews::GetAnchorRect() {
   return gfx::Rect(anchor_point_, gfx::Size());
 }
 
 void ConfirmBubbleViews::Init() {
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   // Add the icon, the title label and the close button to the first row.
   views::ColumnSet* cs = layout->AddColumnSet(0);
   cs->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
                 views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   gfx::Image* icon_image = model_->GetIcon();
   DCHECK(icon_image);
   views::ImageView* icon_view = new views::ImageView;
   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));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  title_label->SetFont(rb.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,
+                         rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG));
+  close_button->SetImage(views::CustomButton::STATE_HOVERED,
+                         rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG_H));
+  close_button->SetImage(views::CustomButton::STATE_PRESSED,
+                         rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG_P));
   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