Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: ui/aura_shell/shell.cc

Issue 8387043: [Aura] Support always-on-top top level window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync, move AlwaysOnTonController from Shell to StackingController Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698