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

Unified Diff: ash/system/overview/overview_button_tray_unittest.cc

Issue 2499453002: Add ink drop ripple to overview mode button (Closed)
Patch Set: Rebased Created 4 years, 1 month 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
Index: ash/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index fd6f3645af99b46947778cc636b88105b5a1c381..7e13d9f90186152ea251ccd63f9d7707e12a4ca0 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -195,20 +195,19 @@ TEST_F(OverviewButtonTrayTest, VisibilityChangesForLoginStatus) {
// dismissal of overview mode clears the active state.
TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
- ASSERT_FALSE(GetTray()->draw_background_as_active());
+ ASSERT_FALSE(GetTray()->is_active());
// Overview Mode only works when there is a window
std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
- ui::GestureEventDetails(ui::ET_GESTURE_TAP));
- GetTray()->PerformAction(tap);
+
+ EXPECT_TRUE(WmShell::Get()->window_selector_controller()->ToggleOverview());
EXPECT_TRUE(WmShell::Get()->window_selector_controller()->IsSelecting());
- EXPECT_TRUE(GetTray()->draw_background_as_active());
+ EXPECT_TRUE(GetTray()->is_active());
- WmShell::Get()->window_selector_controller()->OnSelectionEnded();
+ EXPECT_TRUE(WmShell::Get()->window_selector_controller()->ToggleOverview());
EXPECT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
- EXPECT_FALSE(GetTray()->draw_background_as_active());
+ EXPECT_FALSE(GetTray()->is_active());
}
// Test that when a hide animation is aborted via deletion, that the
« no previous file with comments | « ash/common/wm/overview/window_selector_controller.cc ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698