Add MD ink drop ripple to app list button

ui/views/animation/ink_drop_host_view_unittest.cc

 // Copyright 2016 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/animation/ink_drop_host_view.h"
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
 
 namespace views {
 namespace test {
+namespace {

[sky, 2016/06/30 16:57:48]

nit: nuke the namespace here, I don't think it's necessary.

[mohsen, 2016/07/01 06:06:52]

Done.

+using InkDropMode = InkDropHostViewTestApi::InkDropMode;
+}
 
 class InkDropHostViewTest : public testing::Test {
  public:
   InkDropHostViewTest();
   ~InkDropHostViewTest() override;
 
  protected:
   // Test target.
   InkDropHostView host_view_;
 
@@ skipping 22 matching lines @@
   host_view_.SetSize(gfx::Size(20, 20));
 
   ui::MouseEvent located_event(ui::ET_MOUSE_PRESSED, gfx::Point(5, 6),
                                gfx::Point(5, 6), ui::EventTimeForNow(),
                                ui::EF_LEFT_MOUSE_BUTTON, 0);
 
   test_api_.AnimateInkDrop(InkDropState::ACTION_PENDING, &located_event);
   EXPECT_EQ(gfx::Point(5, 6), test_api_.GetInkDropCenterBasedOnLastEvent());
 }
 
-// Verifies that SetHasInkDrop() sets up gesture handling properly.
-TEST_F(InkDropHostViewTest, SetHasInkDropGestureHandler) {
+// Verifies that SetInkDropMode() sets up gesture handling properly.
+TEST_F(InkDropHostViewTest, SetInkDropModeGestureHandler) {
   EXPECT_FALSE(test_api_.HasGestureHandler());
 
-  test_api_.SetHasInkDrop(true);
+  test_api_.SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
+  EXPECT_FALSE(test_api_.HasGestureHandler());
+
+  test_api_.SetInkDropMode(InkDropMode::ON);
   EXPECT_TRUE(test_api_.HasGestureHandler());
 
-  test_api_.SetHasInkDrop(true);
+  // Enabling gesture handler the second time should just work (no crash).
+  test_api_.SetInkDropMode(InkDropMode::ON);
   EXPECT_TRUE(test_api_.HasGestureHandler());
 
-  test_api_.SetHasInkDrop(false);
+  test_api_.SetInkDropMode(InkDropMode::OFF);
   EXPECT_FALSE(test_api_.HasGestureHandler());
 }
 
 }  // namespace test
 }  // namespace views