Implemented prototype for new ink drop specs.

chrome/browser/ui/views/toolbar/toolbar_button.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/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 81 matching lines @@
 
     // Schedule a task that will show the menu.
     const int kMenuTimerDelay = 500;
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(&ToolbarButton::ShowDropDownMenu,
                               show_menu_factory_.GetWeakPtr(),
                               ui::GetMenuSourceTypeForEvent(event)),
         base::TimeDelta::FromMilliseconds(kMenuTimerDelay));
   }
 
-  ink_drop_animation_controller_->AnimateToState(
-      views::InkDropState::ACTION_PENDING);
+  // Button actions are only triggered by left and middle mouse clicks.

[tdanderson, 2015/08/19 22:11:18]

Don't we also want to show feedback when pressing the right button (in
preparation for showing the history menu on the back button, for instance)?

[bruthig, 2015/08/20 20:35:35]

That will be triggered by the AnimateToState(ACTIVATED) in the
ToolbarButton::ShowDropDownMenu() method.

+  if (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) {

[jonross, 2015/08/19 22:13:36]

Do you need to check the exclusivity of these clicks?

Event::IsOnlyLeftMouseButton / IsOnlyMiddleMouseButton

[bruthig, 2015/08/20 20:35:35]

Negative, actions are still triggered when a button is released while both the
left and middle buttons are pressed. Specifically if the user left clicks and
holds and the animation proceeds to a long press on the "Back" button and then
they middle click and release, then the most recent url in the history is
brought up in a new tab.  This is equivalent to a simple middle click and
release on the "Back" buttonm so IMO it should show an ACTION_PENDING ->
QUICK_ACTION animation sequence which this allows for.

[jonross, 2015/08/21 15:14:48]

Acknowledged.

+    ink_drop_animation_controller_->AnimateToState(
+        views::InkDropState::ACTION_PENDING);
+  }
 
   return LabelButton::OnMousePressed(event);
 }
 
 bool ToolbarButton::OnMouseDragged(const ui::MouseEvent& event) {
   bool result = LabelButton::OnMouseDragged(event);
 
   if (show_menu_factory_.HasWeakPtrs()) {
     // If the mouse is dragged to a y position lower than where it was when
     // clicked then we should not wait for the menu to appear but show
@@ skipping 41 matching lines @@
 
   views::InkDropState ink_drop_state = views::InkDropState::HIDDEN;
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       ink_drop_state = views::InkDropState::ACTION_PENDING;
       // The ui::ET_GESTURE_TAP_DOWN event needs to be marked as handled so that
       // subsequent events for the gesture are sent to |this|.
       event->SetHandled();
       break;
     case ui::ET_GESTURE_LONG_PRESS:
-      ink_drop_state = views::InkDropState::SLOW_ACTION;
+      ink_drop_state = views::InkDropState::SLOW_ACTION_PENDING;
       break;
     case ui::ET_GESTURE_TAP:
       ink_drop_state = views::InkDropState::QUICK_ACTION;
       break;
+    case ui::ET_GESTURE_LONG_TAP:
+      ink_drop_state = views::InkDropState::SLOW_ACTION;
+      break;
     case ui::ET_GESTURE_END:
     case ui::ET_GESTURE_TAP_CANCEL:
       ink_drop_state = views::InkDropState::HIDDEN;
       break;
     default:
       return;
   }
   ink_drop_animation_controller_->AnimateToState(ink_drop_state);
 }
 
@@ skipping 101 matching lines @@
   SetState(STATE_PRESSED);
 
   menu_showing_ = true;
 
   // Create and run menu.  Display an empty menu if model is NULL.
   if (model_.get()) {
     views::MenuModelAdapter menu_delegate(model_.get());
     menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
     menu_runner_.reset(new views::MenuRunner(menu_delegate.CreateMenu(),
                                              views::MenuRunner::HAS_MNEMONICS));
+    ink_drop_animation_controller_->AnimateToState(
+        views::InkDropState::ACTIVATED);

[jonross, 2015/08/19 22:13:36]

Consider refactoring these animations to be around the if block. Moving the
result early exits outside as well.

[bruthig, 2015/08/20 20:35:35]

Done.

     views::MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(),

[jonross, 2015/08/19 22:13:36]

Blocking iirc?

[bruthig, 2015/08/20 20:35:35]

Correct.

[jonross, 2015/08/21 15:14:48]

Acknowledged.

                                 NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
                                 views::MENU_ANCHOR_TOPLEFT,
                                 source_type);
+    ink_drop_animation_controller_->AnimateToState(
+        views::InkDropState::DEACTIVATED);
     if (result == views::MenuRunner::MENU_DELETED)
       return;
   } else {
     views::MenuDelegate menu_delegate;
     views::MenuItemView* menu = new views::MenuItemView(&menu_delegate);
     menu_runner_.reset(
         new views::MenuRunner(menu, views::MenuRunner::HAS_MNEMONICS));
+    ink_drop_animation_controller_->AnimateToState(
+        views::InkDropState::ACTIVATED);
     views::MenuRunner::RunResult result =
         menu_runner_->RunMenuAt(GetWidget(),
                                 NULL,
                                 gfx::Rect(menu_position, gfx::Size(0, 0)),
                                 views::MENU_ANCHOR_TOPLEFT,
                                 source_type);
+    ink_drop_animation_controller_->AnimateToState(
+        views::InkDropState::DEACTIVATED);
     if (result == views::MenuRunner::MENU_DELETED)
       return;
   }
 
-  ink_drop_animation_controller_->AnimateToState(views::InkDropState::HIDDEN);
-
   menu_showing_ = false;
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void ToolbarButton::LayoutInkDrop() {
-  ink_drop_animation_controller_->SetInkDropSize(size());
+  // TODO(bruthig): Get the constants from the theme provider.

[jonross, 2015/08/19 22:13:36]

If you don't do this in the current review, please make them constants of the
file.

[bruthig, 2015/08/20 20:35:35]

Done.

+  gfx::Size ink_drop_size = gfx::Size(32, 32);
+  ink_drop_animation_controller_->SetInkDropSize(ink_drop_size, 5,
+                                                 gfx::Size(24, 24), 2);
+  ink_drop_animation_controller_->SetInkDropOrigin(
+      gfx::Point((width() - ink_drop_size.width()) / 2,
+                 (height() - ink_drop_size.height()) / 2));
+}
+
+void ToolbarButton::NotifyClick(const ui::Event& event) {
+  ink_drop_animation_controller_->AnimateToState(
+      views::InkDropState::QUICK_ACTION);
+  LabelButton::NotifyClick(event);
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }