Reusing Ok/Cancel buttons for intent picker

chrome/browser/ui/views/intent_picker_bubble_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 "chrome/browser/ui/views/intent_picker_bubble_view.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/arc/arc_navigation_throttle.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "url/gurl.h"
 
 using NameAndIcon = arc::ArcNavigationThrottle::NameAndIcon;
 using content::WebContents;
 using content::OpenURLParams;
 using content::Referrer;
 
+class MousePressedEvent : public ui::Event {
+ public:
+  MousePressedEvent() : Event(ui::ET_MOUSE_PRESSED, base::TimeTicks(), 0) {}
+  ~MousePressedEvent() override {}
+};
+
 class IntentPickerBubbleViewTest : public BrowserWithTestWindowTest {
  public:
   IntentPickerBubbleViewTest() = default;
 
   void TearDown() override {
     // Make sure the bubble is destroyed before the profile to avoid a crash.
     bubble_.reset();
 
     BrowserWithTestWindowTest::TearDown();
   }
@@ skipping 36 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IntentPickerBubbleViewTest);
 };
 
 // Verifies that we didn't set up an image for any LabelButton.
 TEST_F(IntentPickerBubbleViewTest, NullIcons) {
   CreateBubbleView(false);
   size_t size = bubble_->app_info_.size();
   for (size_t i = 0; i < size; ++i) {
-    views::LabelButton* app = bubble_->GetLabelButtonAt(i);
-    EXPECT_TRUE(
-        app->GetImage(views::Button::ButtonState::STATE_NORMAL).isNull()) << i;
+    gfx::ImageSkia image = bubble_->GetAppImageForTesting(i);
+    EXPECT_TRUE(image.isNull()) << i;
   }
 }
 
 // Verifies that all the icons contain a non-null icon.
 TEST_F(IntentPickerBubbleViewTest, NonNullIcons) {
   CreateBubbleView(true);
   size_t size = bubble_->app_info_.size();
   for (size_t i = 0; i < size; ++i) {
-    views::LabelButton* app = bubble_->GetLabelButtonAt(i);
-    EXPECT_FALSE(
-        app->GetImage(views::Button::ButtonState::STATE_NORMAL).isNull()) << i;
+    gfx::ImageSkia image = bubble_->GetAppImageForTesting(i);
+    EXPECT_FALSE(image.isNull()) << i;
   }
 }
 
 // Verifies that the bubble contains as many rows as the input. Populated the
 // bubble with an arbitrary image in every row.
 TEST_F(IntentPickerBubbleViewTest, LabelsPtrVectorSize) {
   CreateBubbleView(true);
   EXPECT_EQ(app_info_.size(), bubble_->app_info_.size());
 }
+
+// Verifies the InkDrop state when creating a new bubble.
+TEST_F(IntentPickerBubbleViewTest, VerifyStartingInkDrop) {
+  CreateBubbleView(true);
+  size_t size = bubble_->app_info_.size();
+  for (size_t i = 0; i < size; ++i) {
+    EXPECT_EQ(bubble_->GetInkDropStateForTesting(i),
+              views::InkDropState::HIDDEN);
+  }
+}
+
+// Press each button at a time and make sure it goes to ACTIVATED state,
+// followed by HIDDEN state after selecting other button.
+TEST_F(IntentPickerBubbleViewTest, InkDropStateTransition) {
+  CreateBubbleView(true);
+  size_t size = bubble_->app_info_.size();
+  for (size_t i = 0; i < size; ++i) {
+    bubble_->PressButtonForTesting((i + 1) % size, MousePressedEvent());
+    EXPECT_EQ(bubble_->GetInkDropStateForTesting(i),
+              views::InkDropState::HIDDEN);
+    EXPECT_EQ(bubble_->GetInkDropStateForTesting((i + 1) % size),
+              views::InkDropState::ACTIVATED);
+  }
+}

[bruthig, 2016/09/08 15:13:12]

nit: It might be worth a test that clicks the same button twice.

[djacobo_, 2016/09/08 21:27:06]

Done.