Index: ui/aura_shell/shell.cc |
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc |
index a9d9c817ab547af063e9e20ffffc253026a4f13f..085079611a273a3aa4de0ebd558643c710846374 100644 |
--- a/ui/aura_shell/shell.cc |
+++ b/ui/aura_shell/shell.cc |
@@ -91,6 +91,9 @@ Shell::Shell() |
} |
Shell::~Shell() { |
+ DCHECK(instance_ == this); |
+ instance_ = NULL; |
+ |
// Make sure we delete WorkspaceController before launcher is |
// deleted as it has a reference to launcher model. |
workspace_controller_.reset(); |
@@ -124,6 +127,11 @@ void Shell::Init() { |
(*i)->Show(); |
} |
+ internal::StackingController* stacking_controller = |
+ static_cast<internal::StackingController*>( |
+ desktop_window->stacking_client()); |
+ stacking_controller->Init(); |
+ |
internal::DesktopLayoutManager* desktop_layout = |
new internal::DesktopLayoutManager(desktop_window); |
desktop_window->SetLayoutManager(desktop_layout); |