diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 23:39:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 23:39:03 +0000 |
| commit | 76ff037d061c897dce0794628a8c6a442b2777c4 (patch) | |
| tree | a7b35d428da5de549eb9cb72d8c4fb6f6abb7faa /ash/wm/power_button_controller_unittest.cc | |
| parent | ff89a332e9679cf5d704ea1a0650c4d694c71b42 (diff) | |
| download | chromium_src-76ff037d061c897dce0794628a8c6a442b2777c4.zip chromium_src-76ff037d061c897dce0794628a8c6a442b2777c4.tar.gz chromium_src-76ff037d061c897dce0794628a8c6a442b2777c4.tar.bz2 | |
Revert 123673 - Remove a bunch more uses of RootWindow::GetInstance()
http://crbug.com/112131
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=123592
Review URL: https://chromiumcodereview.appspot.com/9460025
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9455080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/power_button_controller_unittest.cc')
| -rw-r--r-- | ash/wm/power_button_controller_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/power_button_controller_unittest.cc b/ash/wm/power_button_controller_unittest.cc index a90fff6..ad4c496 100644 --- a/ash/wm/power_button_controller_unittest.cc +++ b/ash/wm/power_button_controller_unittest.cc @@ -112,7 +112,7 @@ TEST_F(PowerButtonControllerTest, LegacyLockAndShutDown) { test_api_->ContainerGroupIsAnimated( PowerButtonController::ALL_CONTAINERS, PowerButtonController::ANIMATION_FAST_CLOSE)); - EXPECT_FALSE(Shell::GetRootWindow()->cursor_shown()); + EXPECT_FALSE(aura::RootWindow::GetInstance()->cursor_shown()); EXPECT_TRUE(test_api_->real_shutdown_timer_is_running()); test_api_->trigger_real_shutdown_timeout(); EXPECT_EQ(1, delegate_->num_shutdown_requests()); @@ -476,7 +476,7 @@ TEST_F(PowerButtonControllerTest, ShutdownWithoutButton) { PowerButtonController::ALL_CONTAINERS, PowerButtonController::ANIMATION_HIDE)); EXPECT_TRUE(test_api_->BackgroundLayerIsVisible()); - EXPECT_FALSE(Shell::GetRootWindow()->cursor_shown()); + EXPECT_FALSE(aura::RootWindow::GetInstance()->cursor_shown()); } // Test that we display the fast-close animation and shut down when we get an @@ -493,7 +493,7 @@ TEST_F(PowerButtonControllerTest, RequestShutdownFromLoginScreen) { PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS, PowerButtonController::ANIMATION_FAST_CLOSE)); EXPECT_TRUE(test_api_->BackgroundLayerIsVisible()); - EXPECT_FALSE(Shell::GetRootWindow()->cursor_shown()); + EXPECT_FALSE(aura::RootWindow::GetInstance()->cursor_shown()); EXPECT_EQ(0, delegate_->num_shutdown_requests()); EXPECT_TRUE(test_api_->real_shutdown_timer_is_running()); @@ -514,7 +514,7 @@ TEST_F(PowerButtonControllerTest, RequestShutdownFromLockScreen) { PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS, PowerButtonController::ANIMATION_FAST_CLOSE)); EXPECT_TRUE(test_api_->BackgroundLayerIsVisible()); - EXPECT_FALSE(Shell::GetRootWindow()->cursor_shown()); + EXPECT_FALSE(aura::RootWindow::GetInstance()->cursor_shown()); EXPECT_EQ(0, delegate_->num_shutdown_requests()); EXPECT_TRUE(test_api_->real_shutdown_timer_is_running()); |