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

chrome/browser/ui/views/location_bar/bubble_icon_view.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 "chrome/browser/ui/views/location_bar/bubble_icon_view.h"
 
 #include "chrome/browser/command_updater.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/animation/ink_drop_hover.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 
 BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
     : image_(new views::ImageView()),
       command_updater_(command_updater),
       command_id_(command_id),
       active_(false),
-      suppress_mouse_released_action_(false),
-      ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)) {
+      suppress_mouse_released_action_(false) {
   AddChildView(image_);
   image_->set_interactive(false);
   image_->EnableCanvasFlippingForRTLUI(true);
-  image_->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+  if (ui::MaterialDesignController::IsModeMaterial())
+    SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+  else
+    image_->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
+
+  set_ink_drop_delegate(
+      base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
 }
 
 BubbleIconView::~BubbleIconView() {}
 
 bool BubbleIconView::IsBubbleShowing() const {
   // If the bubble is being destroyed, it's considered showing though it may be
   // already invisible currently.
   return GetBubble() != nullptr;
 }
 
@@ skipping 25 matching lines @@
 
 void BubbleIconView::Layout() {
   View::Layout();
   image_->SetBoundsRect(GetLocalBounds());
 }
 
 bool BubbleIconView::OnMousePressed(const ui::MouseEvent& event) {
   // If the bubble is showing then don't reshow it when the mouse is released.
   suppress_mouse_released_action_ = IsBubbleShowing();
   if (!suppress_mouse_released_action_ && event.IsOnlyLeftMouseButton())
-    ink_drop_delegate_->OnAction(views::InkDropState::ACTION_PENDING);
+    ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
 
   // We want to show the bubble on mouse release; that is the standard behavior
   // for buttons.
   return true;
 }
 
 void BubbleIconView::OnMouseReleased(const ui::MouseEvent& event) {
   // If this is the second click on this view then the bubble was showing on the
   // mouse pressed event and is hidden now. Prevent the bubble from reshowing by
   // doing nothing here.
   if (suppress_mouse_released_action_) {
     suppress_mouse_released_action_ = false;
     OnPressed(false);
     return;
   }
   if (!event.IsLeftMouseButton())
     return;
 
   const bool activated = HitTestPoint(event.location());
-  ink_drop_delegate_->OnAction(activated ? views::InkDropState::ACTIVATED
-                                         : views::InkDropState::HIDDEN);
+  ink_drop_delegate()->OnAction(activated ? views::InkDropState::ACTIVATED
+                                          : views::InkDropState::HIDDEN);
   if (activated)
     ExecuteCommand(EXECUTE_SOURCE_MOUSE);
   OnPressed(activated);
 }
 
 bool BubbleIconView::OnKeyPressed(const ui::KeyEvent& event) {
   if (event.key_code() != ui::VKEY_RETURN && event.key_code() != ui::VKEY_SPACE)
     return false;
 
-  ink_drop_delegate_->OnAction(views::InkDropState::ACTIVATED);
+  ink_drop_delegate()->OnAction(views::InkDropState::ACTIVATED);
   // As with CustomButton, return activates on key down and space activates on
   // key up.
   if (event.key_code() == ui::VKEY_RETURN)
     ExecuteCommand(EXECUTE_SOURCE_KEYBOARD);
   return true;
 }
 
 bool BubbleIconView::OnKeyReleased(const ui::KeyEvent& event) {
   if (event.key_code() != ui::VKEY_SPACE)
     return false;
@@ skipping 20 matching lines @@
 }
 
 void BubbleIconView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   views::InkDropHostView::RemoveInkDropLayer(ink_drop_layer);
   image_->SetPaintToLayer(false);
 }
 
 std::unique_ptr<views::InkDropHover> BubbleIconView::CreateInkDropHover()
     const {
   // BubbleIconView views don't show hover effect.
-  return nullptr;
+  return HasFocus() ? InkDropHostView::CreateInkDropHover() : nullptr;
 }
 
 SkColor BubbleIconView::GetInkDropBaseColor() const {
   return color_utils::DeriveDefaultIconColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor));
 }
 
+bool BubbleIconView::ShouldShowInkDropForFocus() const {
+  return true;
+}
+
 void BubbleIconView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP) {
-    ink_drop_delegate_->OnAction(views::InkDropState::ACTIVATED);
+    ink_drop_delegate()->OnAction(views::InkDropState::ACTIVATED);
     ExecuteCommand(EXECUTE_SOURCE_GESTURE);
     event->SetHandled();
   }
 }
 
 void BubbleIconView::OnWidgetDestroying(views::Widget* widget) {
   widget->RemoveObserver(this);
 }
 
 void BubbleIconView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible)
-    ink_drop_delegate_->OnAction(views::InkDropState::DEACTIVATED);
+    ink_drop_delegate()->OnAction(views::InkDropState::DEACTIVATED);
 }
 
 void BubbleIconView::ExecuteCommand(ExecuteSource source) {
   OnExecuting(source);
   if (command_updater_)
     command_updater_->ExecuteCommand(command_id_);
 }
 
 gfx::VectorIconId BubbleIconView::GetVectorIcon() const {
   return gfx::VectorIconId::VECTOR_ICON_NONE;
@@ skipping 23 matching lines @@
   image_->SetImage(
       gfx::CreateVectorIcon(GetVectorIcon(), icon_size, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }