Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2840773003: views: Button ripple/highlight is visible during shelf swipe. (Closed)
Patch Set: Rebased. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_host_view.cc » ('j') | ui/views/animation/ink_drop_host_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index a2e7b1d3427543957b8f1f4da7ba904be8e898fa..95ae0737bfafe0ffaf9b06802a939245aa523d95 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -2697,9 +2697,10 @@ TEST_F(OverflowButtonInkDropTest, TouchContextMenu) {
mock_task_runner->FastForwardUntilNoTasksRemain();
EXPECT_EQ(views::InkDropState::HIDDEN,
overflow_button_ink_drop_->GetTargetInkDropState());
- EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
- ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING,
- views::InkDropState::HIDDEN));
+ EXPECT_THAT(
+ overflow_button_ink_drop_->GetAndResetRequestedStates(),
+ ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING,
+ views::InkDropState::HIDDEN, views::InkDropState::HIDDEN));
generator.ReleaseTouch();
EXPECT_EQ(views::InkDropState::HIDDEN,
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_host_view.cc » ('j') | ui/views/animation/ink_drop_host_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698