Update dialog close buttons to use vector icons and ripples.

chrome/browser/ui/views/find_bar_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/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/number_formatting.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/bar_control_button.h"
 #include "chrome/browser/ui/views/find_bar_host.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // The margins around the UI controls, derived from assets and design specs.
@@ skipping 78 matching lines @@
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   find_text_->set_default_width_in_chars(
       ui::MaterialDesignController::IsModeMaterial() ? kDefaultCharWidthMd
                                                      : kDefaultCharWidth);
   find_text_->set_controller(this);
   find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
   find_text_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
   AddChildView(find_text_);
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
-    BarControlButton* find_previous = new BarControlButton(this);
-    find_previous->SetIcon(
-        gfx::VectorIconId::FIND_PREV,
-        base::Bind(&FindBarView::GetTextColorForIcon, base::Unretained(this)));
-    BarControlButton* find_next = new BarControlButton(this);
-    find_next->SetIcon(
-        gfx::VectorIconId::FIND_NEXT,
-        base::Bind(&FindBarView::GetTextColorForIcon, base::Unretained(this)));
-    BarControlButton* close = new BarControlButton(this);
-    close->SetIcon(
-        gfx::VectorIconId::BAR_CLOSE,
-        base::Bind(&FindBarView::GetTextColorForIcon, base::Unretained(this)));
+    views::VectorIconButton* find_previous = new views::VectorIconButton(this);
+    find_previous->SetIcon(gfx::VectorIconId::FIND_PREV);
+    views::VectorIconButton* find_next = new views::VectorIconButton(this);
+    find_next->SetIcon(gfx::VectorIconId::FIND_NEXT);
+    views::VectorIconButton* close = new views::VectorIconButton(this);
+    close->SetIcon(gfx::VectorIconId::BAR_CLOSE);
 
     find_previous_button_ = find_previous;
     find_next_button_ = find_next;
     close_button_ = close;
   } else {
     find_previous_button_ = new views::ImageButton(this);
     find_next_button_ = new views::ImageButton(this);
     close_button_ = new views::ImageButton(this);
   }
 
@@ skipping 250 matching lines @@
                        kMarginLeftOfFindTextfield -
                        find_text_->GetInsets().width(),
                    0);
   prefsize.Enlarge(find_previous_button_->GetPreferredSize().width(), 0);
   prefsize.Enlarge(find_next_button_->GetPreferredSize().width(), 0);
   prefsize.Enlarge(close_button_->GetPreferredSize().width(), 0);
   return prefsize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// FindBarView, views::ButtonListener implementation:
+// FindBarView, views::VectorIconButtonDelegate implementation:
 
 void FindBarView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   switch (sender->id()) {
     case VIEW_ID_FIND_IN_PAGE_PREVIOUS_BUTTON:
     case VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON:
       if (!find_text_->text().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
             find_bar_host()->GetFindBarController()->web_contents());
         find_tab_helper->StartFinding(
             find_text_->text(),
             sender->id() == VIEW_ID_FIND_IN_PAGE_NEXT_BUTTON,
             false);  // Not case sensitive.
       }
       break;
     case VIEW_ID_FIND_IN_PAGE_CLOSE_BUTTON:
       find_bar_host()->GetFindBarController()->EndFindSession(
           FindBarController::kKeepSelectionOnPage,
           FindBarController::kKeepResultsInFindBox);
       break;
     default:
       NOTREACHED() << "Unknown button";
       break;
   }
 }
 
+SkColor FindBarView::GetVectorIconBaseColor() const {
+  return GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultColor);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::TextfieldController implementation:
 
 bool FindBarView::HandleKeyEvent(views::Textfield* sender,
                                  const ui::KeyEvent& key_event) {
   // If the dialog is not visible, there is no reason to process keyboard input.
   if (!host()->IsVisible())
     return false;
 
   if (find_bar_host()->MaybeForwardKeyEventToWebpage(key_event))
@@ skipping 195 matching lines @@
       ui::NativeTheme::kColorId_TextfieldDefaultBackground);
   set_background(views::Background::CreateSolidBackground(bg_color));
   match_count_text_->SetBackgroundColor(bg_color);
 
   SkColor text_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldDefaultColor);
   match_count_text_->SetEnabledColor(SkColorSetA(text_color, 0x69));
   separator_->SetColor(SkColorSetA(text_color, 0x26));
 }
 
-SkColor FindBarView::GetTextColorForIcon() {
-  return GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_TextfieldDefaultColor);
-}