Add MD ink drop ripple to app list button

ui/views/controls/button/custom_button_unittest.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 "ui/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 39 matching lines @@
   void ShowContextMenuForView(View* source,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestContextMenuController);
 };
 
 class TestCustomButton : public CustomButton, public ButtonListener {
  public:
-  explicit TestCustomButton()
+  explicit TestCustomButton(bool has_ink_drop_action_on_click)
       : CustomButton(this) {
+    set_has_ink_drop_action_on_click(has_ink_drop_action_on_click);
   }
 
   ~TestCustomButton() override {}
 
   void ButtonPressed(Button* sender, const ui::Event& event) override {
     pressed_ = true;
   }
 
   void OnClickCanceled(const ui::Event& event) override {
     canceled_ = true;
@@ skipping 29 matching lines @@
 
     // Create a widget so that the CustomButton can query the hover state
     // correctly.
     widget_.reset(new Widget);
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 650, 650);
     widget_->Init(params);
     widget_->Show();
 
-    button_ = new TestCustomButton();
+    button_ = new TestCustomButton(false);
     widget_->SetContentsView(button_);
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
-  void CreateButtonWithInkDrop(std::unique_ptr<InkDrop> ink_drop) {
+  void CreateButtonWithInkDrop(std::unique_ptr<InkDrop> ink_drop,
+                               bool has_ink_drop_action_on_click) {
     delete button_;
-    button_ = new TestCustomButton();
+    button_ = new TestCustomButton(has_ink_drop_action_on_click);
     InkDropHostViewTestApi(button_).SetInkDrop(std::move(ink_drop));
     widget_->SetContentsView(button_);
   }
 
  protected:
   Widget* widget() { return widget_.get(); }
   TestCustomButton* button() { return button_; }
   void SetDraggedView(View* dragged_view) {
     widget_->dragged_view_ = dragged_view;
   }
@@ skipping 208 matching lines @@
   Textfield textfield;
   EXPECT_FALSE(CustomButton::AsCustomButton(&textfield));
 }
 
 // Tests that pressing a button shows the ink drop and releasing the button
 // does not hide the ink drop.
 // Note: Ink drop is not hidden upon release because CustomButton descendants
 // may enter a different ink drop state.
 TEST_F(CustomButtonTest, ButtonClickTogglesInkDrop) {
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
 
   ui::test::EventGenerator generator(widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 
   generator.ReleaseLeftButton();
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 }
 
 // Tests that pressing a button shows and releasing capture hides ink drop.
 // Releasing capture should also reset PRESSED button state to NORMAL.
 TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
 
   ui::test::EventGenerator generator(widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 
   EXPECT_EQ(Button::ButtonState::STATE_PRESSED, button()->state());
   SetDraggedView(button());
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   SetDraggedView(nullptr);
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
   EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial()
                 ? Button::ButtonState::STATE_NORMAL
                 : Button::ButtonState::STATE_PRESSED,
             button()->state());
 }
 
 TEST_F(CustomButtonTest, HideInkDropWhenShowingContextMenu) {
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
   TestContextMenuController context_menu_controller;
   button()->set_context_menu_controller(&context_menu_controller);
   button()->set_hide_ink_drop_when_showing_context_menu(true);
 
   ink_drop->SetHovered(true);
   ink_drop->AnimateToState(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_FALSE(ink_drop->is_hovered());
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 }
 
 TEST_F(CustomButtonTest, DontHideInkDropWhenShowingContextMenu) {
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
   TestContextMenuController context_menu_controller;
   button()->set_context_menu_controller(&context_menu_controller);
   button()->set_hide_ink_drop_when_showing_context_menu(false);
 
   ink_drop->SetHovered(true);
   ink_drop->AnimateToState(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_TRUE(ink_drop->is_hovered());
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 }
 
 TEST_F(CustomButtonTest, HideInkDropOnBlur) {
   gfx::Point center(10, 10);
 
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
 
   button()->OnFocus();
 
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 
   button()->OnBlur();
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 
   button()->OnMouseReleased(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
   EXPECT_TRUE(button()->pressed());
 }
 
 TEST_F(CustomButtonTest, InkDropAfterTryingToShowContextMenu) {
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
   button()->set_context_menu_controller(nullptr);
 
   ink_drop->SetHovered(true);
   ink_drop->AnimateToState(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_TRUE(ink_drop->is_hovered());
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 }
 
 TEST_F(CustomButtonTest, InkDropShowHideOnMouseDragged) {

[bruthig, 2016/06/22 19:07:29]

nit: Can you add the suffix 'NotifyOnRelease'.

[mohsen, 2016/06/23 15:49:56]

Done.

   gfx::Point center(10, 10);
   gfx::Point oob(-1, -1);
 
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
 

[bruthig, 2016/06/22 19:07:29]

nit: Can you add 'button()->set_notify_action(CustomButton::NOTIFY_ON_RELEASE);'
here to be explicit.

[mohsen, 2016/06/23 15:49:56]

Done.

   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 
   button()->OnMouseDragged(
       ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
                      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
@@ skipping 11 matching lines @@
 
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 
   button()->OnMouseReleased(
       ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
                      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
   EXPECT_FALSE(button()->pressed());
 }
 
+// Tests that when button is set to notify on press, dragging mouse out and back
+// does not change the ink drop state.
+TEST_F(CustomButtonTest, InkDropShowHideOnMouseDraggedNotifyOnPress) {
+  gfx::Point center(10, 10);
+  gfx::Point oob(-1, -1);
+
+  TestInkDrop* ink_drop = new TestInkDrop();
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), true);
+  button()->set_notify_action(CustomButton::NOTIFY_ON_PRESS);
+
+  button()->OnMousePressed(ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+
+  EXPECT_EQ(InkDropState::ACTION_TRIGGERED, ink_drop->GetTargetInkDropState());
+  EXPECT_TRUE(button()->pressed());
+
+  button()->OnMouseDragged(
+      ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
+                     ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+
+  EXPECT_EQ(InkDropState::ACTION_TRIGGERED, ink_drop->GetTargetInkDropState());
+
+  button()->OnMouseDragged(ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+
+  EXPECT_EQ(InkDropState::ACTION_TRIGGERED, ink_drop->GetTargetInkDropState());
+
+  button()->OnMouseDragged(
+      ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
+                     ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+
+  EXPECT_EQ(InkDropState::ACTION_TRIGGERED, ink_drop->GetTargetInkDropState());
+
+  button()->OnMouseReleased(
+      ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
+                     ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+
+  EXPECT_EQ(InkDropState::ACTION_TRIGGERED, ink_drop->GetTargetInkDropState());
+}
+
 TEST_F(CustomButtonTest, InkDropStaysHiddenWhileDragging) {
   gfx::Point center(10, 10);
   gfx::Point oob(-1, -1);
 
   TestInkDrop* ink_drop = new TestInkDrop();
-  CreateButtonWithInkDrop(base::WrapUnique(ink_drop));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop), false);
 
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop->GetTargetInkDropState());
 
   SetDraggedView(button());
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
 
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 
   button()->OnMouseDragged(
       ui::MouseEvent(ui::ET_MOUSE_PRESSED, oob, oob, ui::EventTimeForNow(),
                      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 
   button()->OnMouseDragged(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
 
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop->GetTargetInkDropState());
 
   SetDraggedView(nullptr);
 }
 
 }  // namespace views