Add VectorIconButton functionality to ImageButton.

ui/message_center/views/message_center_button_bar.cc

 // Copyright 2013 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 "ui/message_center/views/message_center_button_bar.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/message_center/views/message_center_view.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 
 namespace message_center {
 
 namespace {
 const int kButtonSize = 40;
 const int kLeftPaddingWidthForNonArrows = 16;
 const int kFooterTopMargin = 6;
 const int kFooterBottomMargin = 3;
 const int kFooterLeftMargin = 4;
 const int kFooterRightMargin = 14;
 }  // namespace
 
 // NotificationCenterButton ////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 class NotificationCenterButton : public views::ToggleImageButton {
  public:
-  NotificationCenterButton(views::ButtonListener* listener,
+  NotificationCenterButton(views::ImageButtonDelegate* listener,
                            int normal_id,
                            int hover_id,
                            int pressed_id,
                            int text_id);
   void set_size(gfx::Size size) { size_ = size; }
 
  protected:
   // Overridden from views::View:
   gfx::Size GetPreferredSize() const override;
 
  private:
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationCenterButton);
 };
 
 NotificationCenterButton::NotificationCenterButton(
-    views::ButtonListener* listener,
+    views::ImageButtonDelegate* listener,
     int normal_id,
     int hover_id,
     int pressed_id,
     int text_id)
     : views::ToggleImageButton(listener), size_(kButtonSize, kButtonSize) {
   ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
   SetImage(STATE_NORMAL, *resource_bundle.GetImageSkiaNamed(normal_id));
   SetImage(STATE_HOVERED, *resource_bundle.GetImageSkiaNamed(hover_id));
   SetImage(STATE_PRESSED, *resource_bundle.GetImageSkiaNamed(pressed_id));
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
@@ skipping 244 matching lines @@
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   } else if (sender == close_bubble_button_) {
     message_center_view()->tray()->HideMessageCenterBubble();
 #endif
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace message_center