| 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
|
|
|