Index: ui/aura_shell/stacking_controller.cc |
diff --git a/ui/aura_shell/stacking_controller.cc b/ui/aura_shell/stacking_controller.cc |
index 1371c207fd8d1787d60efb32fd918721dc535449..0f23d6d4de184ddd1a7a8e08e63acd1826dbf632 100644 |
--- a/ui/aura_shell/stacking_controller.cc |
+++ b/ui/aura_shell/stacking_controller.cc |
@@ -6,6 +6,7 @@ |
#include "ui/aura/desktop.h" |
#include "ui/aura/window.h" |
+#include "ui/aura_shell/always_on_top_controller.h" |
#include "ui/aura_shell/shell.h" |
#include "ui/aura_shell/shell_window_ids.h" |
@@ -35,6 +36,13 @@ StackingController::StackingController() { |
StackingController::~StackingController() { |
} |
+void StackingController::Init() { |
+ always_on_top_controller_.reset(new internal::AlwaysOnTopController); |
+ always_on_top_controller_->SetContainers( |
+ GetContainer(internal::kShellWindowId_DefaultContainer), |
+ GetContainer(internal::kShellWindowId_AlwaysOnTopContainer)); |
+} |
+ |
// static |
aura::Window* StackingController::GetActivatableWindow(aura::Window* window) { |
aura::Window* parent = window->parent(); |
@@ -56,7 +64,7 @@ void StackingController::AddChildToDefaultParent(aura::Window* window) { |
switch (window->type()) { |
case aura::WINDOW_TYPE_NORMAL: |
case aura::WINDOW_TYPE_POPUP: |
- parent = GetContainer(internal::kShellWindowId_DefaultContainer); |
+ parent = always_on_top_controller_->GetContainer(window); |
break; |
case aura::WINDOW_TYPE_MENU: |
case aura::WINDOW_TYPE_TOOLTIP: |