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_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
11 #include "ash/desktop_background/desktop_background_widget_controller.h" | 11 #include "ash/desktop_background/desktop_background_widget_controller.h" |
12 #include "ash/display/display_controller.h" | 12 #include "ash/display/display_controller.h" |
13 #include "ash/display/display_manager.h" | 13 #include "ash/display/display_manager.h" |
14 #include "ash/focus_cycler.h" | 14 #include "ash/focus_cycler.h" |
15 #include "ash/session_state_delegate.h" | 15 #include "ash/session_state_delegate.h" |
16 #include "ash/shelf/shelf_layout_manager.h" | 16 #include "ash/shelf/shelf_layout_manager.h" |
17 #include "ash/shelf/shelf_types.h" | 17 #include "ash/shelf/shelf_types.h" |
18 #include "ash/shelf/shelf_widget.h" | 18 #include "ash/shelf/shelf_widget.h" |
19 #include "ash/shell.h" | 19 #include "ash/shell.h" |
20 #include "ash/shell_delegate.h" | 20 #include "ash/shell_delegate.h" |
21 #include "ash/shell_factory.h" | 21 #include "ash/shell_factory.h" |
22 #include "ash/shell_window_ids.h" | 22 #include "ash/shell_window_ids.h" |
23 #include "ash/system/status_area_widget.h" | 23 #include "ash/system/status_area_widget.h" |
24 #include "ash/system/tray/system_tray_delegate.h" | 24 #include "ash/system/tray/system_tray_delegate.h" |
25 #include "ash/touch/touch_observer_hud.h" | 25 #include "ash/touch/touch_observer_hud.h" |
26 #include "ash/wm/base_layout_manager.h" | 26 #include "ash/wm/base_layout_manager.h" |
27 #include "ash/wm/boot_splash_screen.h" | 27 #include "ash/wm/boot_splash_screen.h" |
28 #include "ash/wm/dock/docked_window_layout_manager.h" | 28 #include "ash/wm/dock/docked_window_layout_manager.h" |
29 #include "ash/wm/panels/panel_layout_manager.h" | 29 #include "ash/wm/panels/panel_layout_manager.h" |
| 30 #include "ash/wm/panels/panel_window_event_handler.h" |
30 #include "ash/wm/property_util.h" | 31 #include "ash/wm/property_util.h" |
31 #include "ash/wm/root_window_layout_manager.h" | 32 #include "ash/wm/root_window_layout_manager.h" |
32 #include "ash/wm/screen_dimmer.h" | 33 #include "ash/wm/screen_dimmer.h" |
33 #include "ash/wm/stacking_controller.h" | 34 #include "ash/wm/stacking_controller.h" |
34 #include "ash/wm/status_area_layout_manager.h" | 35 #include "ash/wm/status_area_layout_manager.h" |
35 #include "ash/wm/system_background_controller.h" | 36 #include "ash/wm/system_background_controller.h" |
36 #include "ash/wm/system_modal_container_layout_manager.h" | 37 #include "ash/wm/system_modal_container_layout_manager.h" |
37 #include "ash/wm/toplevel_window_event_handler.h" | 38 #include "ash/wm/toplevel_window_event_handler.h" |
38 #include "ash/wm/window_properties.h" | 39 #include "ash/wm/window_properties.h" |
39 #include "ash/wm/window_util.h" | 40 #include "ash/wm/window_util.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 docked_container_handler_.reset( | 283 docked_container_handler_.reset( |
283 new ToplevelWindowEventHandler(docked_container)); | 284 new ToplevelWindowEventHandler(docked_container)); |
284 docked_container->SetLayoutManager(docked_layout_manager_); | 285 docked_container->SetLayoutManager(docked_layout_manager_); |
285 | 286 |
286 // Create Panel layout manager | 287 // Create Panel layout manager |
287 aura::Window* panel_container = GetContainer( | 288 aura::Window* panel_container = GetContainer( |
288 internal::kShellWindowId_PanelContainer); | 289 internal::kShellWindowId_PanelContainer); |
289 panel_layout_manager_ = | 290 panel_layout_manager_ = |
290 new internal::PanelLayoutManager(panel_container); | 291 new internal::PanelLayoutManager(panel_container); |
291 panel_container_handler_.reset( | 292 panel_container_handler_.reset( |
292 new ToplevelWindowEventHandler(panel_container)); | 293 new PanelWindowEventHandler(panel_container)); |
293 panel_container->SetLayoutManager(panel_layout_manager_); | 294 panel_container->SetLayoutManager(panel_layout_manager_); |
294 | 295 |
295 // TODO(stevenjb/oshima): Remove this call to CreateLauncher() and call | 296 // TODO(stevenjb/oshima): Remove this call to CreateLauncher() and call |
296 // ash::Shell::CreateLauncher() explicitly in ash_shell and ash_unittests | 297 // ash::Shell::CreateLauncher() explicitly in ash_shell and ash_unittests |
297 // so that the behavior and construction order is consistent betwheen Ash | 298 // so that the behavior and construction order is consistent betwheen Ash |
298 // and Chrome. | 299 // and Chrome. |
299 if (Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) | 300 if (Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) |
300 shelf_->CreateLauncher(); | 301 shelf_->CreateLauncher(); |
301 | 302 |
302 InitKeyboard(); | 303 InitKeyboard(); |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
647 "OverlayContainer", | 648 "OverlayContainer", |
648 lock_screen_related_containers); | 649 lock_screen_related_containers); |
649 SetUsesScreenCoordinates(overlay_container); | 650 SetUsesScreenCoordinates(overlay_container); |
650 | 651 |
651 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 652 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
652 "PowerButtonAnimationContainer", root_window) ; | 653 "PowerButtonAnimationContainer", root_window) ; |
653 } | 654 } |
654 | 655 |
655 } // namespace internal | 656 } // namespace internal |
656 } // namespace ash | 657 } // namespace ash |
OLD | NEW |