diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 00:59:15 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 00:59:15 +0000 |
| commit | b8881b434694b1d56d081d9133ff97887a70bd38 (patch) | |
| tree | 2d8f92788b97cfe24b9ccefbb9db183177e54351 /ash/wm/shadow_controller.cc | |
| parent | 87d6297c0888fd9ddfaf458928e026d2b4e53b67 (diff) | |
| download | chromium_src-b8881b434694b1d56d081d9133ff97887a70bd38.zip chromium_src-b8881b434694b1d56d081d9133ff97887a70bd38.tar.gz chromium_src-b8881b434694b1d56d081d9133ff97887a70bd38.tar.bz2 | |
Revert 123592 - Remove a bunch more uses of RootWindow::GetInstance()
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9460025
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9464038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shadow_controller.cc')
| -rw-r--r-- | ash/wm/shadow_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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); } |