1 files changed, 4 insertions, 7 deletions
diff --git a/ui/aura_shell/stacking_controller.cc b/ui/aura_shell/stacking_controller.cc
index dba6da1..dedf726 100644
--- a/ui/aura_shell/stacking_controller.cc
+++ b/ui/aura_shell/stacking_controller.cc
@@ -29,19 +29,16 @@ bool IsWindowModal(aura::Window* window) {
 // StackingController, public:
 
 StackingController::StackingController() {
-  aura::RootWindow::GetInstance()->SetStackingClient(this);
-}
-
-StackingController::~StackingController() {
-}
-
-void StackingController::Init() {
+  aura::StackingClient::SetStackingClient(this);
   always_on_top_controller_.reset(new internal::AlwaysOnTopController);
   always_on_top_controller_->SetContainers(
       GetContainer(internal::kShellWindowId_DefaultContainer),
       GetContainer(internal::kShellWindowId_AlwaysOnTopContainer));
 }
 
+StackingController::~StackingController() {
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, aura::StackingClient implementation: