Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Side by Side Diff: ash/root_window_controller.cc

Issue 254673004: Add LockLayoutManager responsible for lock container (login/lock). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix crash Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 ::wm::SetChildWindowVisibilityChangesAnimated(modal_container); 1005 ::wm::SetChildWindowVisibilityChangesAnimated(modal_container);
1005 SetUsesScreenCoordinates(modal_container); 1006 SetUsesScreenCoordinates(modal_container);
1006 SetUsesEasyResizeTargeter(modal_container); 1007 SetUsesEasyResizeTargeter(modal_container);
1007 1008
1008 // TODO(beng): Figure out if we can make this use 1009 // TODO(beng): Figure out if we can make this use
1009 // SystemModalContainerEventFilter instead of stops_event_propagation. 1010 // SystemModalContainerEventFilter instead of stops_event_propagation.
1010 aura::Window* lock_container = CreateContainer( 1011 aura::Window* lock_container = CreateContainer(
1011 kShellWindowId_LockScreenContainer, 1012 kShellWindowId_LockScreenContainer,
1012 "LockScreenContainer", 1013 "LockScreenContainer",
1013 lock_screen_containers); 1014 lock_screen_containers);
1014 lock_container->SetLayoutManager(new WorkspaceLayoutManager(lock_container)); 1015 if (CommandLine::ForCurrentProcess()->HasSwitch(
1016 switches::kAshDisableLockLayoutManager)) {
1017 lock_container->SetLayoutManager(
1018 new WorkspaceLayoutManager(lock_container));
1019 } else {
1020 lock_container->SetLayoutManager(new LockLayoutManager(lock_container));
1021 }
1015 SetUsesScreenCoordinates(lock_container); 1022 SetUsesScreenCoordinates(lock_container);
1016 // TODO(beng): stopsevents 1023 // TODO(beng): stopsevents
1017 1024
1018 aura::Window* lock_modal_container = CreateContainer( 1025 aura::Window* lock_modal_container = CreateContainer(
1019 kShellWindowId_LockSystemModalContainer, 1026 kShellWindowId_LockSystemModalContainer,
1020 "LockSystemModalContainer", 1027 "LockSystemModalContainer",
1021 lock_screen_containers); 1028 lock_screen_containers);
1022 lock_modal_container->SetLayoutManager( 1029 lock_modal_container->SetLayoutManager(
1023 new SystemModalContainerLayoutManager(lock_modal_container)); 1030 new SystemModalContainerLayoutManager(lock_modal_container));
1024 ::wm::SetChildWindowVisibilityChangesAnimated(lock_modal_container); 1031 ::wm::SetChildWindowVisibilityChangesAnimated(lock_modal_container);
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 else 1107 else
1101 DisableTouchHudProjection(); 1108 DisableTouchHudProjection();
1102 } 1109 }
1103 1110
1104 RootWindowController* GetRootWindowController( 1111 RootWindowController* GetRootWindowController(
1105 const aura::Window* root_window) { 1112 const aura::Window* root_window) {
1106 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1113 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1107 } 1114 }
1108 1115
1109 } // namespace ash 1116 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698