Use ink drop hover for focus states on toolbar buttons and location

chrome/browser/ui/views/bookmarks/bookmark_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/bookmarks/bookmark_bar_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 186 matching lines @@
 }
 
 // BookmarkButtonBase -----------------------------------------------
 
 // Base class for non-menu hosting buttons used on the bookmark bar.
 
 class BookmarkButtonBase : public views::LabelButton {
  public:
   BookmarkButtonBase(views::ButtonListener* listener,
                      const base::string16& title)
-      : LabelButton(listener, title), ink_drop_delegate_(this, this) {
+      : LabelButton(listener, title) {
     SetElideBehavior(kElideBehavior);
-    set_ink_drop_delegate(&ink_drop_delegate_);
+    set_ink_drop_delegate(
+        base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
     set_has_ink_drop_action_on_click(true);
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
@@ skipping 34 matching lines @@
   }
 
   SkColor GetInkDropBaseColor() const override {
     return GetThemeProvider()->GetColor(
         ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
   }
 
  private:
   std::unique_ptr<gfx::SlideAnimation> show_animation_;
 
-  // Controls the visual feedback for the button state.
-  views::ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
 
 // BookmarkButton -------------------------------------------------------------
 
 // Buttons used for the bookmarks on the bookmark bar.
 
 class BookmarkButton : public BookmarkButtonBase {
  public:
@@ skipping 49 matching lines @@
 const char ShortcutButton::kViewClassName[] = "ShortcutButton";
 
 // BookmarkMenuButtonBase -----------------------------------------------------
 
 // Base class for menu hosting buttons used on the bookmark bar.
 class BookmarkMenuButtonBase : public views::MenuButton {
  public:
   BookmarkMenuButtonBase(const base::string16& title,
                          views::MenuButtonListener* menu_button_listener,
                          bool show_menu_marker)
-      : MenuButton(title, menu_button_listener, show_menu_marker),
-        ink_drop_delegate_(this, this) {
-    set_ink_drop_delegate(&ink_drop_delegate_);
+      : MenuButton(title, menu_button_listener, show_menu_marker) {
+    set_ink_drop_delegate(
+        base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
   }
 
   std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
     return base::WrapUnique(new views::FloodFillInkDropRipple(
         CalculateInkDropBounds(size()), GetInkDropCenter(),
         GetInkDropBaseColor()));
   }
 
   std::unique_ptr<views::InkDropHover> CreateInkDropHover() const override {
     if (!ShouldShowInkDropHover())
       return nullptr;
 
     const gfx::Rect bounds = CalculateInkDropBounds(size());
     return base::WrapUnique(new views::InkDropHover(
         bounds.size(), 0, bounds.CenterPoint(), GetInkDropBaseColor()));
   }
 
   SkColor GetInkDropBaseColor() const override {
     return GetThemeProvider()->GetColor(
         ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
   }
 
  private:
-  // Controls the visual feedback for the button state.
-  views::ButtonInkDropDelegate ink_drop_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuButtonBase);
 };
 
 // BookmarkFolderButton -------------------------------------------------------
 
 // Buttons used for folders on the bookmark bar, including the 'other folders'
 // button.
 class BookmarkFolderButton : public BookmarkMenuButtonBase {
  public:
   BookmarkFolderButton(const base::string16& title,
@@ skipping 1785 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }