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

2 files changed, 6 insertions, 7 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());
diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc
index 7e7d5f5..ed7af82 100644
--- a/ash/wm/shadow_controller.cc
+++ b/ash/wm/shadow_controller.cc
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "ash/ash_switches.h"
-#include "ash/shell.h"
 #include "ash/wm/shadow.h"
 #include "ash/wm/shadow_types.h"
 #include "ash/wm/window_properties.h"
@@ -47,7 +46,7 @@ ShadowType GetShadowTypeFromWindow(aura::Window* window) {
 ShadowController::ShadowController() {
   aura::Env::GetInstance()->AddObserver(this);
   // Watch for window activation changes.
-  Shell::GetRootWindow()->AddObserver(this);
+  aura::RootWindow::GetInstance()->AddObserver(this);
 }
 
 ShadowController::~ShadowController() {
@@ -55,7 +54,7 @@ ShadowController::~ShadowController() {
        it != window_shadows_.end(); ++it) {
     it->first->RemoveObserver(this);
   }
-  Shell::GetRootWindow()->RemoveObserver(this);
+  aura::RootWindow::GetInstance()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
 }