OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/desktop_background/desktop_background_widget_controller.h" | 10 #include "ash/desktop_background/desktop_background_widget_controller.h" |
11 #include "ash/display/display_controller.h" | 11 #include "ash/display/display_controller.h" |
12 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
13 #include "ash/focus_cycler.h" | 13 #include "ash/focus_cycler.h" |
14 #include "ash/shelf_types.h" | 14 #include "ash/shelf_types.h" |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "ash/shell_delegate.h" | 16 #include "ash/shell_delegate.h" |
17 #include "ash/shell_factory.h" | 17 #include "ash/shell_factory.h" |
18 #include "ash/shell_window_ids.h" | 18 #include "ash/shell_window_ids.h" |
19 #include "ash/system/status_area_widget.h" | 19 #include "ash/system/status_area_widget.h" |
20 #include "ash/system/tray/system_tray_delegate.h" | 20 #include "ash/system/tray/system_tray_delegate.h" |
21 #include "ash/wm/base_layout_manager.h" | 21 #include "ash/wm/base_layout_manager.h" |
22 #include "ash/wm/boot_splash_screen.h" | 22 #include "ash/wm/boot_splash_screen.h" |
23 #include "ash/wm/panel_layout_manager.h" | 23 #include "ash/wm/panel_layout_manager.h" |
24 #include "ash/wm/panel_window_event_filter.h" | 24 #include "ash/wm/panel_window_event_filter.h" |
25 #include "ash/wm/property_util.h" | 25 #include "ash/wm/property_util.h" |
26 #include "ash/wm/root_window_layout_manager.h" | 26 #include "ash/wm/root_window_layout_manager.h" |
27 #include "ash/wm/screen_dimmer.h" | 27 #include "ash/wm/screen_dimmer.h" |
28 #include "ash/wm/shelf_layout_manager.h" | 28 #include "ash/wm/shelf_layout_manager.h" |
| 29 #include "ash/wm/stacking_controller.h" |
29 #include "ash/wm/status_area_layout_manager.h" | 30 #include "ash/wm/status_area_layout_manager.h" |
30 #include "ash/wm/system_background_controller.h" | 31 #include "ash/wm/system_background_controller.h" |
31 #include "ash/wm/system_modal_container_layout_manager.h" | 32 #include "ash/wm/system_modal_container_layout_manager.h" |
32 #include "ash/wm/toplevel_window_event_handler.h" | 33 #include "ash/wm/toplevel_window_event_handler.h" |
33 #include "ash/wm/window_properties.h" | 34 #include "ash/wm/window_properties.h" |
34 #include "ash/wm/workspace_controller.h" | 35 #include "ash/wm/workspace_controller.h" |
35 #include "base/command_line.h" | 36 #include "base/command_line.h" |
36 #include "base/time.h" | 37 #include "base/time.h" |
37 #include "ui/aura/client/activation_client.h" | 38 #include "ui/aura/client/activation_client.h" |
38 #include "ui/aura/client/aura_constants.h" | 39 #include "ui/aura/client/aura_constants.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 namespace internal { | 162 namespace internal { |
162 | 163 |
163 RootWindowController::RootWindowController(aura::RootWindow* root_window) | 164 RootWindowController::RootWindowController(aura::RootWindow* root_window) |
164 : root_window_(root_window), | 165 : root_window_(root_window), |
165 root_window_layout_(NULL), | 166 root_window_layout_(NULL), |
166 status_area_widget_(NULL), | 167 status_area_widget_(NULL), |
167 shelf_(NULL), | 168 shelf_(NULL), |
168 panel_layout_manager_(NULL) { | 169 panel_layout_manager_(NULL) { |
169 SetRootWindowController(root_window, this); | 170 SetRootWindowController(root_window, this); |
170 screen_dimmer_.reset(new ScreenDimmer(root_window)); | 171 screen_dimmer_.reset(new ScreenDimmer(root_window)); |
| 172 |
| 173 stacking_controller_.reset(new ash::StackingController); |
| 174 aura::client::SetStackingClient(root_window, stacking_controller_.get()); |
171 } | 175 } |
172 | 176 |
173 RootWindowController::~RootWindowController() { | 177 RootWindowController::~RootWindowController() { |
174 Shutdown(); | 178 Shutdown(); |
175 root_window_.reset(); | 179 root_window_.reset(); |
176 } | 180 } |
177 | 181 |
178 // static | 182 // static |
179 RootWindowController* RootWindowController::ForLauncher(aura::Window* window) { | 183 RootWindowController* RootWindowController::ForLauncher(aura::Window* window) { |
180 if (Shell::IsLauncherPerDisplayEnabled()) | 184 if (Shell::IsLauncherPerDisplayEnabled()) |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
676 "OverlayContainer", | 680 "OverlayContainer", |
677 lock_screen_related_containers); | 681 lock_screen_related_containers); |
678 SetUsesScreenCoordinates(overlay_container); | 682 SetUsesScreenCoordinates(overlay_container); |
679 | 683 |
680 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 684 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
681 "PowerButtonAnimationContainer", root_window) ; | 685 "PowerButtonAnimationContainer", root_window) ; |
682 } | 686 } |
683 | 687 |
684 } // namespace internal | 688 } // namespace internal |
685 } // namespace ash | 689 } // namespace ash |
OLD | NEW |