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

Unified Diff: ash/common/system/tray/system_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
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_unittest.cc
diff --git a/ash/common/system/tray/system_tray_unittest.cc b/ash/common/system/tray/system_tray_unittest.cc
index b4f1bba0e4408901feb8eeb1d482e0ec1d57b87e..4e770956b1eb24781e38bcdd741039a54f5c2531 100644
--- a/ash/common/system/tray/system_tray_unittest.cc
+++ b/ash/common/system/tray/system_tray_unittest.cc
@@ -236,16 +236,16 @@ TEST_F(SystemTrayTest, SystemTrayColoring) {
SystemTray* tray = GetPrimarySystemTray();
ASSERT_TRUE(tray->GetWidget());
// At the beginning the tray coloring is not active.
- ASSERT_FALSE(tray->draw_background_as_active());
+ ASSERT_FALSE(tray->is_active());
// Showing the system bubble should show the background as active.
tray->ShowDefaultView(BUBBLE_CREATE_NEW);
- ASSERT_TRUE(tray->draw_background_as_active());
+ ASSERT_TRUE(tray->is_active());
// Closing the system menu should change the coloring back to normal.
ASSERT_TRUE(tray->CloseSystemBubble());
RunAllPendingInMessageLoop();
- ASSERT_FALSE(tray->draw_background_as_active());
+ ASSERT_FALSE(tray->is_active());
}
// Closing the system bubble through an alignment change should change the
@@ -256,16 +256,16 @@ TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
WmShelf* shelf = GetPrimaryShelf();
shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
// At the beginning the tray coloring is not active.
- ASSERT_FALSE(tray->draw_background_as_active());
+ ASSERT_FALSE(tray->is_active());
// Showing the system bubble should show the background as active.
tray->ShowDefaultView(BUBBLE_CREATE_NEW);
- ASSERT_TRUE(tray->draw_background_as_active());
+ ASSERT_TRUE(tray->is_active());
// Changing the alignment should close the system bubble and change the
// background color.
shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
- ASSERT_FALSE(tray->draw_background_as_active());
+ ASSERT_FALSE(tray->is_active());
RunAllPendingInMessageLoop();
// The bubble should already be closed by now.
ASSERT_FALSE(tray->CloseSystemBubble());
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698