Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 9663ff91fb64b9db87fc65d0dfe94ca293d991f7..46b610444a2f404649d68d70fba01e840e90bc5f 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -33,6 +33,7 @@ |
#include "ash/tooltips/tooltip_controller.h" |
#include "ash/touch/touch_observer_hud.h" |
#include "ash/wm/activation_controller.h" |
+#include "ash/wm/always_on_top_controller.h" |
#include "ash/wm/app_list_controller.h" |
#include "ash/wm/base_layout_manager.h" |
#include "ash/wm/capture_controller.h" |
@@ -61,6 +62,7 @@ |
#include "ash/wm/window_cycle_controller.h" |
#include "ash/wm/window_modality_controller.h" |
#include "ash/wm/window_util.h" |
+#include "ash/wm/window_properties.h" |
#include "ash/wm/workspace/workspace_event_filter.h" |
#include "ash/wm/workspace/workspace_layout_manager.h" |
#include "ash/wm/workspace/workspace_manager.h" |
@@ -721,6 +723,16 @@ void Shell::InitRootWindowController( |
root_window->SetCursor(ui::kCursorPointer); |
controller->InitLayoutManagers(); |
+ |
+ // TODO(oshima): Move the instance to RootWindowController when |
+ // the extended desktop is enabled by default. |
+ internal::AlwaysOnTopController* always_on_top_controller = |
+ new internal::AlwaysOnTopController; |
+ always_on_top_controller->SetContainers( |
+ root_window->GetChildById(internal::kShellWindowId_DefaultContainer), |
+ root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer)); |
+ root_window->SetProperty(internal::kAlwaysOnTopControllerKey, |
+ always_on_top_controller); |
} |
//////////////////////////////////////////////////////////////////////////////// |