diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 22:28:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 22:28:27 +0000 |
| commit | 0239e8694892e4ad603f77f758bbff30b3aff216 (patch) | |
| tree | 40001fcf114ca31d4cdd7905f7c12a6b9a80e4a5 /ash/wm/shadow_controller.cc | |
| parent | 2199f8d7f135ecb0b880ad64c65df889847e7373 (diff) | |
| download | chromium_src-0239e8694892e4ad603f77f758bbff30b3aff216.zip chromium_src-0239e8694892e4ad603f77f758bbff30b3aff216.tar.gz chromium_src-0239e8694892e4ad603f77f758bbff30b3aff216.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123673 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, 3 insertions, 2 deletions
diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc index ed7af82..7e7d5f5 100644 --- a/ash/wm/shadow_controller.cc +++ b/ash/wm/shadow_controller.cc @@ -7,6 +7,7 @@ #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" @@ -46,7 +47,7 @@ ShadowType GetShadowTypeFromWindow(aura::Window* window) { ShadowController::ShadowController() { aura::Env::GetInstance()->AddObserver(this); // Watch for window activation changes. - aura::RootWindow::GetInstance()->AddObserver(this); + Shell::GetRootWindow()->AddObserver(this); } ShadowController::~ShadowController() { @@ -54,7 +55,7 @@ ShadowController::~ShadowController() { it != window_shadows_.end(); ++it) { it->first->RemoveObserver(this); } - aura::RootWindow::GetInstance()->RemoveObserver(this); + Shell::GetRootWindow()->RemoveObserver(this); aura::Env::GetInstance()->RemoveObserver(this); } |