Added ink drop hover/ripple to menu hosting bookmark buttons.

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 76 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
+#include "ui/views/animation/flood_fill_ink_drop_animation.h"
+#include "ui/views/animation/ink_drop_hover.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/metrics.h"
 #include "ui/views/view_constants.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
@@ skipping 74 matching lines @@
 gfx::ImageSkia* GetImageSkiaNamed(int id) {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
 }
 
 int GetHorizontalMargin() {
   return kHorizontalMargin[ui::MaterialDesignController::GetMode()];
 }
 
 // BookmarkButtonBase -----------------------------------------------
 
-// Base class for buttons used on the bookmark bar.
+// 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) {
     SetElideBehavior(kElideBehavior);
     set_ink_drop_delegate(&ink_drop_delegate_);
     set_has_ink_drop_action_on_click(true);
     show_animation_.reset(new gfx::SlideAnimation(this));
@@ skipping 18 matching lines @@
                                    kButtonPaddingHorizontal));
     return border;
   }
 
   bool IsTriggerableEvent(const ui::Event& e) override {
     return e.type() == ui::ET_GESTURE_TAP ||
            e.type() == ui::ET_GESTURE_TAP_DOWN ||
            event_utils::IsPossibleDispositionEvent(e);
   }
 
+  scoped_ptr<views::InkDropAnimation> CreateInkDropAnimation() const override {
+    return make_scoped_ptr(new views::FloodFillInkDropAnimation(
+        size(), GetInkDropCenter(), GetInkDropBaseColor()));
+  }
+
+  scoped_ptr<views::InkDropHover> CreateInkDropHover() const override {
+    if (!ShouldShowInkDropHover())
+      return nullptr;
+    return make_scoped_ptr(new views::InkDropHover(
+        size(), 0, GetInkDropCenter(), GetInkDropBaseColor()));
+  }
+
   SkColor GetInkDropBaseColor() const override {
-    return GetThemeProvider()->GetColor(
-        ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+    return GetThemeProvider()

[varkha, 2016/03/11 17:57:17]

When is there no ThemeProvider? Maybe a comment.

[bruthig, 2016/03/11 21:58:20]

Done.

+               ? GetThemeProvider()->GetColor(
+                     ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
+               : views::LabelButton::GetInkDropBaseColor();
   }
 
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   // Controls the visual feedback for the button state.
   views::ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
@@ skipping 50 matching lines @@
 
   const char* GetClassName() const override { return kViewClassName; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShortcutButton);
 };
 
 // static
 const char ShortcutButton::kViewClassName[] = "ShortcutButton";
 
 // BookmarkFolderButton -------------------------------------------------------

[varkha, 2016/03/11 17:57:17]

Move this down and add another section.

[bruthig, 2016/03/11 21:58:20]

Done.

 
+// 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_);
+  }
+
+  scoped_ptr<views::InkDropAnimation> CreateInkDropAnimation() const override {
+    return make_scoped_ptr(new views::FloodFillInkDropAnimation(
+        size(), GetInkDropCenter(), GetInkDropBaseColor()));
+  }
+
+  scoped_ptr<views::InkDropHover> CreateInkDropHover() const override {
+    if (!ShouldShowInkDropHover())
+      return nullptr;
+    return make_scoped_ptr(new views::InkDropHover(
+        size(), 0, GetInkDropCenter(), GetInkDropBaseColor()));
+  }
+
+  SkColor GetInkDropBaseColor() const override {
+    return GetThemeProvider()
+               ? GetThemeProvider()->GetColor(
+                     ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
+               : views::LabelButton::GetInkDropBaseColor();
+  }
+
+ private:
+  // Controls the visual feedback for the button state.
+  views::ButtonInkDropDelegate ink_drop_delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkMenuButtonBase);
+};
+
 // Buttons used for folders on the bookmark bar, including the 'other folders'
 // button.
-class BookmarkFolderButton : public views::MenuButton {
+class BookmarkFolderButton : public BookmarkMenuButtonBase {
  public:
   BookmarkFolderButton(const base::string16& title,
                        views::MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
-      : MenuButton(title, menu_button_listener, show_menu_marker) {
+      : BookmarkMenuButtonBase(title, menu_button_listener, show_menu_marker) {
     SetElideBehavior(kElideBehavior);
     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();
     }
   }
 
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override {
     if (label()->GetPreferredSize().width() > label()->size().width())
       *tooltip = GetText();
     return !tooltip->empty();
   }
 
+  bool OnMousePressed(const ui::MouseEvent& event) override {
+    if (event.IsOnlyLeftMouseButton()) {
+      // TODO(bruthig): The ACTION_PENDING triggering logic should be in
+      // MenuButton::OnPressed() however there is a bug with the pressed state
+      // logic in MenuButton. See http://crbug.com/567252.
+      ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
+    }
+    return MenuButton::OnMousePressed(event);
+  }
+
   bool IsTriggerableEventType(const ui::Event& e) override {
     // Bookmark folders handle normal menu button events (i.e., left click) as
     // well as clicks to open bookmarks in new tabs that would otherwise be
     // ignored.
-    return views::MenuButton::IsTriggerableEventType(e) ||
+    return BookmarkMenuButtonBase::IsTriggerableEventType(e) ||
            (e.IsMouseEvent() &&
-                ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB);
+            ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB);
   }
 
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // OverflowButton (chevron) --------------------------------------------------
 
-class OverflowButton : public views::MenuButton {
+class OverflowButton : public BookmarkMenuButtonBase {
  public:
   explicit OverflowButton(BookmarkBarView* owner)
-      : MenuButton(base::string16(), owner, false), owner_(owner) {}
+      : BookmarkMenuButtonBase(base::string16(), owner, false), owner_(owner) {}
 
   bool OnMousePressed(const ui::MouseEvent& e) override {
     owner_->StopThrobbing(true);
-    return views::MenuButton::OnMousePressed(e);
+    return BookmarkMenuButtonBase::OnMousePressed(e);
   }
 
  private:
   BookmarkBarView* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowButton);
 };
 
 void RecordAppLaunch(Profile* profile, const GURL& url) {
   const extensions::Extension* extension =
@@ skipping 1714 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }