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

Unified Diff: ash/common/system/tiles/tray_tiles_unittest.cc

Issue 2591553002: Remove non-cros support from ash/common/system. (Closed)
Patch Set: jc review + rebase Created 4 years 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/tiles/tiles_default_view.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tiles/tray_tiles_unittest.cc
diff --git a/ash/common/system/tiles/tray_tiles_unittest.cc b/ash/common/system/tiles/tray_tiles_unittest.cc
index 0ad362a05f853b9771dd0b02c4a100ee11760880..39308bd0d69e41200ea7ccacea75260dc7b24d32 100644
--- a/ash/common/system/tiles/tray_tiles_unittest.cc
+++ b/ash/common/system/tiles/tray_tiles_unittest.cc
@@ -58,10 +58,8 @@ TEST_F(TrayTilesTest, ButtonStatesWithAddingUser) {
tray_tiles()->CreateDefaultViewForTesting(LoginStatus::USER));
EXPECT_EQ(GetSettingsButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetHelpButton()->state(), views::Button::STATE_DISABLED);
-#if !defined(OS_WIN)
EXPECT_EQ(GetLockButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetPowerButton()->state(), views::Button::STATE_NORMAL);
-#endif // !defined(OS_WIN)
}
TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusNotLoggedIn) {
@@ -69,10 +67,8 @@ TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusNotLoggedIn) {
tray_tiles()->CreateDefaultViewForTesting(LoginStatus::NOT_LOGGED_IN));
EXPECT_EQ(GetSettingsButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetHelpButton()->state(), views::Button::STATE_DISABLED);
-#if !defined(OS_WIN)
EXPECT_EQ(GetLockButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetPowerButton()->state(), views::Button::STATE_NORMAL);
-#endif // !defined(OS_WIN)
}
TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusLocked) {
@@ -80,10 +76,8 @@ TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusLocked) {
tray_tiles()->CreateDefaultViewForTesting(LoginStatus::LOCKED));
EXPECT_EQ(GetSettingsButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetHelpButton()->state(), views::Button::STATE_DISABLED);
-#if !defined(OS_WIN)
EXPECT_EQ(GetLockButton()->state(), views::Button::STATE_DISABLED);
EXPECT_EQ(GetPowerButton()->state(), views::Button::STATE_NORMAL);
-#endif // !defined(OS_WIN)
}
TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusUser) {
@@ -91,10 +85,8 @@ TEST_F(TrayTilesTest, ButtonStatesWithLoginStatusUser) {
tray_tiles()->CreateDefaultViewForTesting(LoginStatus::USER));
EXPECT_EQ(GetSettingsButton()->state(), views::Button::STATE_NORMAL);
EXPECT_EQ(GetHelpButton()->state(), views::Button::STATE_NORMAL);
-#if !defined(OS_WIN)
EXPECT_EQ(GetLockButton()->state(), views::Button::STATE_NORMAL);
EXPECT_EQ(GetPowerButton()->state(), views::Button::STATE_NORMAL);
-#endif // !defined(OS_WIN)
}
} // namespace ash
« no previous file with comments | « ash/common/system/tiles/tiles_default_view.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698