Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/infobars/infobar_view.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/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.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/image_button.h"
+#include "ui/views/controls/button/image_button_factory.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/button/vector_icon_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 
 // Helpers --------------------------------------------------------------------
@@ skipping 114 matching lines @@
 
   if (details.is_add && (details.child == this) && (close_button_ == NULL)) {
     gfx::Image image = delegate()->GetIcon();
     if (!image.IsEmpty()) {
       icon_ = new views::ImageView;
       icon_->SetImage(image.ToImageSkia());
       icon_->SizeToPreferredSize();
       child_container_->AddChildView(icon_);
     }
 
-    close_button_ = new views::VectorIconButton(this);
-    close_button_->SetIcon(ui::kCloseIcon);
+    close_button_ = views::CreateVectorImageButton(this);
+    views::SetImageFromVectorIcon(close_button_, ui::kCloseIcon,
+                                  GetInfobarTextColor());
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->SetFocusForPlatform();
     // Subclasses should already be done adding child views by this point (see
     // related DCHECK in Layout()).
     child_container_->AddChildView(close_button_);
   }
 
   // Ensure the infobar is tall enough to display its contents.
   int height = InfoBarContainerDelegate::kDefaultBarTargetHeight;
   const int kMinimumVerticalPadding = 6;
   for (int i = 0; i < child_container_->child_count(); ++i) {
     const int child_height = child_container_->child_at(i)->height();
     height = std::max(height, child_height + kMinimumVerticalPadding);
   }
   SetBarTargetHeight(height);
 }
 
 void InfoBarView::ButtonPressed(views::Button* sender,
                                 const ui::Event& event) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
   if (sender == close_button_) {
     delegate()->InfoBarDismissed();
     RemoveSelf();
   }
 }
 
-SkColor InfoBarView::GetVectorIconBaseColor() const {
-  return GetInfobarTextColor();
-}
-
 int InfoBarView::ContentMinimumWidth() const {
   return 0;
 }
 
 int InfoBarView::StartX() const {
   // Ensure we don't return a value greater than EndX(), so children can safely
   // set something's width to "EndX() - StartX()" without risking that being
   // negative.
   return std::min(EndX(), (icon_ != NULL) ?
       (icon_->bounds().right() + kIconToLabelSpacing) : kEdgeItemPadding);
@@ skipping 90 matching lines @@
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }