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 <queue> | 7 #include <queue> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "ash/shell_window_ids.h" | 27 #include "ash/shell_window_ids.h" |
28 #include "ash/switchable_windows.h" | 28 #include "ash/switchable_windows.h" |
29 #include "ash/system/status_area_widget.h" | 29 #include "ash/system/status_area_widget.h" |
30 #include "ash/system/tray/system_tray_delegate.h" | 30 #include "ash/system/tray/system_tray_delegate.h" |
31 #include "ash/system/tray/system_tray_notifier.h" | 31 #include "ash/system/tray/system_tray_notifier.h" |
32 #include "ash/touch/touch_hud_debug.h" | 32 #include "ash/touch/touch_hud_debug.h" |
33 #include "ash/touch/touch_hud_projection.h" | 33 #include "ash/touch/touch_hud_projection.h" |
34 #include "ash/touch/touch_observer_hud.h" | 34 #include "ash/touch/touch_observer_hud.h" |
35 #include "ash/wm/always_on_top_controller.h" | 35 #include "ash/wm/always_on_top_controller.h" |
36 #include "ash/wm/dock/docked_window_layout_manager.h" | 36 #include "ash/wm/dock/docked_window_layout_manager.h" |
| 37 #include "ash/wm/lock_layout_manager.h" |
37 #include "ash/wm/panels/attached_panel_window_targeter.h" | 38 #include "ash/wm/panels/attached_panel_window_targeter.h" |
38 #include "ash/wm/panels/panel_layout_manager.h" | 39 #include "ash/wm/panels/panel_layout_manager.h" |
39 #include "ash/wm/panels/panel_window_event_handler.h" | 40 #include "ash/wm/panels/panel_window_event_handler.h" |
40 #include "ash/wm/root_window_layout_manager.h" | 41 #include "ash/wm/root_window_layout_manager.h" |
41 #include "ash/wm/screen_dimmer.h" | 42 #include "ash/wm/screen_dimmer.h" |
42 #include "ash/wm/stacking_controller.h" | 43 #include "ash/wm/stacking_controller.h" |
43 #include "ash/wm/status_area_layout_manager.h" | 44 #include "ash/wm/status_area_layout_manager.h" |
44 #include "ash/wm/system_background_controller.h" | 45 #include "ash/wm/system_background_controller.h" |
45 #include "ash/wm/system_modal_container_layout_manager.h" | 46 #include "ash/wm/system_modal_container_layout_manager.h" |
46 #include "ash/wm/window_properties.h" | 47 #include "ash/wm/window_properties.h" |
(...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1001 ::wm::SetChildWindowVisibilityChangesAnimated(modal_container); | 1002 ::wm::SetChildWindowVisibilityChangesAnimated(modal_container); |
1002 SetUsesScreenCoordinates(modal_container); | 1003 SetUsesScreenCoordinates(modal_container); |
1003 SetUsesEasyResizeTargeter(modal_container); | 1004 SetUsesEasyResizeTargeter(modal_container); |
1004 | 1005 |
1005 // TODO(beng): Figure out if we can make this use | 1006 // TODO(beng): Figure out if we can make this use |
1006 // SystemModalContainerEventFilter instead of stops_event_propagation. | 1007 // SystemModalContainerEventFilter instead of stops_event_propagation. |
1007 aura::Window* lock_container = CreateContainer( | 1008 aura::Window* lock_container = CreateContainer( |
1008 kShellWindowId_LockScreenContainer, | 1009 kShellWindowId_LockScreenContainer, |
1009 "LockScreenContainer", | 1010 "LockScreenContainer", |
1010 lock_screen_containers); | 1011 lock_screen_containers); |
1011 lock_container->SetLayoutManager(new WorkspaceLayoutManager(lock_container)); | 1012 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 1013 switches::kAshDisableLockLayoutManager)) { |
| 1014 lock_container->SetLayoutManager( |
| 1015 new WorkspaceLayoutManager(lock_container)); |
| 1016 } else { |
| 1017 lock_container->SetLayoutManager(new LockLayoutManager(lock_container)); |
| 1018 } |
1012 SetUsesScreenCoordinates(lock_container); | 1019 SetUsesScreenCoordinates(lock_container); |
1013 // TODO(beng): stopsevents | 1020 // TODO(beng): stopsevents |
1014 | 1021 |
1015 aura::Window* lock_modal_container = CreateContainer( | 1022 aura::Window* lock_modal_container = CreateContainer( |
1016 kShellWindowId_LockSystemModalContainer, | 1023 kShellWindowId_LockSystemModalContainer, |
1017 "LockSystemModalContainer", | 1024 "LockSystemModalContainer", |
1018 lock_screen_containers); | 1025 lock_screen_containers); |
1019 lock_modal_container->SetLayoutManager( | 1026 lock_modal_container->SetLayoutManager( |
1020 new SystemModalContainerLayoutManager(lock_modal_container)); | 1027 new SystemModalContainerLayoutManager(lock_modal_container)); |
1021 ::wm::SetChildWindowVisibilityChangesAnimated(lock_modal_container); | 1028 ::wm::SetChildWindowVisibilityChangesAnimated(lock_modal_container); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1097 else | 1104 else |
1098 DisableTouchHudProjection(); | 1105 DisableTouchHudProjection(); |
1099 } | 1106 } |
1100 | 1107 |
1101 RootWindowController* GetRootWindowController( | 1108 RootWindowController* GetRootWindowController( |
1102 const aura::Window* root_window) { | 1109 const aura::Window* root_window) { |
1103 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1110 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
1104 } | 1111 } |
1105 | 1112 |
1106 } // namespace ash | 1113 } // namespace ash |
OLD | NEW |