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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_view.h" 5 #include "ash/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2679 matching lines...) Expand 10 before | Expand all | Expand 10 after
2690 2690
2691 generator.PressTouch(); 2691 generator.PressTouch();
2692 EXPECT_EQ(views::InkDropState::ACTION_PENDING, 2692 EXPECT_EQ(views::InkDropState::ACTION_PENDING,
2693 overflow_button_ink_drop_->GetTargetInkDropState()); 2693 overflow_button_ink_drop_->GetTargetInkDropState());
2694 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2694 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2695 ElementsAre(views::InkDropState::ACTION_PENDING)); 2695 ElementsAre(views::InkDropState::ACTION_PENDING));
2696 2696
2697 mock_task_runner->FastForwardUntilNoTasksRemain(); 2697 mock_task_runner->FastForwardUntilNoTasksRemain();
2698 EXPECT_EQ(views::InkDropState::HIDDEN, 2698 EXPECT_EQ(views::InkDropState::HIDDEN,
2699 overflow_button_ink_drop_->GetTargetInkDropState()); 2699 overflow_button_ink_drop_->GetTargetInkDropState());
2700 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2700 EXPECT_THAT(
2701 ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING, 2701 overflow_button_ink_drop_->GetAndResetRequestedStates(),
2702 views::InkDropState::HIDDEN)); 2702 ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING,
2703 views::InkDropState::HIDDEN, views::InkDropState::HIDDEN));
2703 2704
2704 generator.ReleaseTouch(); 2705 generator.ReleaseTouch();
2705 EXPECT_EQ(views::InkDropState::HIDDEN, 2706 EXPECT_EQ(views::InkDropState::HIDDEN,
2706 overflow_button_ink_drop_->GetTargetInkDropState()); 2707 overflow_button_ink_drop_->GetTargetInkDropState());
2707 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2708 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2708 IsEmpty()); 2709 IsEmpty());
2709 2710
2710 EXPECT_FALSE(test_api_->IsShowingOverflowBubble()); 2711 EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
2711 } 2712 }
2712 2713
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
3015 EXPECT_EQ(views::InkDropState::ACTIVATED, 3016 EXPECT_EQ(views::InkDropState::ACTIVATED,
3016 overflow_button_ink_drop_->GetTargetInkDropState()); 3017 overflow_button_ink_drop_->GetTargetInkDropState());
3017 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 3018 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
3018 IsEmpty()); 3019 IsEmpty());
3019 3020
3020 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3021 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3021 } 3022 }
3022 3023
3023 } // namespace test 3024 } // namespace test
3024 } // namespace ash 3025 } // namespace ash
OLDNEW
« 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