Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
@@ skipping 54 matching lines @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/controls/button/blue_button.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 63 matching lines @@
 
 std::string GetAuthErrorAccountId(Profile* profile) {
   const SigninErrorController* error =
       SigninErrorControllerFactory::GetForProfile(profile);
   if (!error)
     return std::string();
 
   return error->error_account_id();
 }
 
-views::ImageButton* CreateBackButton(views::ButtonListener* listener) {
+views::ImageButton* CreateBackButton(views::ImageButtonDelegate* listener) {
   views::ImageButton* back_button = new views::ImageButton(listener);
   back_button->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
                                  views::ImageButton::ALIGN_MIDDLE);
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   back_button->SetImage(views::ImageButton::STATE_NORMAL,
                         rb->GetImageSkiaNamed(IDR_BACK));
   back_button->SetImage(views::ImageButton::STATE_HOVERED,
                         rb->GetImageSkiaNamed(IDR_BACK_H));
   back_button->SetImage(views::ImageButton::STATE_PRESSED,
                         rb->GetImageSkiaNamed(IDR_BACK_P));
@@ skipping 271 matching lines @@
   views::ImageView* photo_overlay_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(EditableProfilePhoto);
 };
 
 // A title card with one back button right aligned and one label center aligned.
 class TitleCard : public views::View {
  public:
-  TitleCard(const base::string16& message, views::ButtonListener* listener,
+  TitleCard(const base::string16& message,
+            views::ImageButtonDelegate* listener,
             views::ImageButton** back_button) {
     back_button_ = CreateBackButton(listener);
     *back_button = back_button_;
 
     title_label_ = new views::Label(message);
     title_label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     const gfx::FontList& medium_font_list =
         rb->GetFontList(ui::ResourceBundle::MediumFont);
     title_label_->SetFontList(medium_font_list);
@@ skipping 1504 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }