Chromium Code Reviews| 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 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1011 | 1011 |
| 1012 aura::Window* settings_bubble_container = CreateContainer( | 1012 aura::Window* settings_bubble_container = CreateContainer( |
| 1013 kShellWindowId_SettingBubbleContainer, | 1013 kShellWindowId_SettingBubbleContainer, |
| 1014 "SettingBubbleContainer", | 1014 "SettingBubbleContainer", |
| 1015 lock_screen_related_containers); | 1015 lock_screen_related_containers); |
| 1016 ::wm::SetChildWindowVisibilityChangesAnimated(settings_bubble_container); | 1016 ::wm::SetChildWindowVisibilityChangesAnimated(settings_bubble_container); |
| 1017 wm::SetSnapsChildrenToPhysicalPixelBoundary(settings_bubble_container); | 1017 wm::SetSnapsChildrenToPhysicalPixelBoundary(settings_bubble_container); |
| 1018 SetUsesScreenCoordinates(settings_bubble_container); | 1018 SetUsesScreenCoordinates(settings_bubble_container); |
| 1019 DescendantShouldStayInSameRootWindow(settings_bubble_container); | 1019 DescendantShouldStayInSameRootWindow(settings_bubble_container); |
| 1020 | 1020 |
| 1021 aura::Window* virtual_keyboard_parent_container = CreateContainer( | |
| 1022 kShellWindowId_VirtualKeyboardParentContainer, | |
| 1023 "VirtualKeyboardParentContainer", | |
| 1024 lock_screen_related_containers); | |
|
James Cook
2014/09/12 22:01:52
Just to double-check -- the virtual keyboard still
kevers
2014/09/15 17:23:45
Confirmed that the lock screen is well behaved.
| |
| 1025 wm::SetSnapsChildrenToPhysicalPixelBoundary( | |
| 1026 virtual_keyboard_parent_container); | |
| 1027 SetUsesScreenCoordinates(virtual_keyboard_parent_container); | |
| 1028 | |
| 1021 aura::Window* menu_container = CreateContainer( | 1029 aura::Window* menu_container = CreateContainer( |
| 1022 kShellWindowId_MenuContainer, | 1030 kShellWindowId_MenuContainer, |
| 1023 "MenuContainer", | 1031 "MenuContainer", |
| 1024 lock_screen_related_containers); | 1032 lock_screen_related_containers); |
| 1025 ::wm::SetChildWindowVisibilityChangesAnimated(menu_container); | 1033 ::wm::SetChildWindowVisibilityChangesAnimated(menu_container); |
| 1026 wm::SetSnapsChildrenToPhysicalPixelBoundary(menu_container); | 1034 wm::SetSnapsChildrenToPhysicalPixelBoundary(menu_container); |
| 1027 SetUsesScreenCoordinates(menu_container); | 1035 SetUsesScreenCoordinates(menu_container); |
| 1028 | 1036 |
| 1029 aura::Window* drag_drop_container = CreateContainer( | 1037 aura::Window* drag_drop_container = CreateContainer( |
| 1030 kShellWindowId_DragImageAndTooltipContainer, | 1038 kShellWindowId_DragImageAndTooltipContainer, |
| 1031 "DragImageAndTooltipContainer", | 1039 "DragImageAndTooltipContainer", |
| 1032 lock_screen_related_containers); | 1040 lock_screen_related_containers); |
| 1033 ::wm::SetChildWindowVisibilityChangesAnimated(drag_drop_container); | 1041 ::wm::SetChildWindowVisibilityChangesAnimated(drag_drop_container); |
| 1034 wm::SetSnapsChildrenToPhysicalPixelBoundary(drag_drop_container); | 1042 wm::SetSnapsChildrenToPhysicalPixelBoundary(drag_drop_container); |
| 1035 SetUsesScreenCoordinates(drag_drop_container); | 1043 SetUsesScreenCoordinates(drag_drop_container); |
| 1036 | 1044 |
| 1037 aura::Window* overlay_container = CreateContainer( | 1045 aura::Window* overlay_container = CreateContainer( |
| 1038 kShellWindowId_OverlayContainer, | 1046 kShellWindowId_OverlayContainer, |
| 1039 "OverlayContainer", | 1047 "OverlayContainer", |
| 1040 lock_screen_related_containers); | 1048 lock_screen_related_containers); |
| 1041 wm::SetSnapsChildrenToPhysicalPixelBoundary(overlay_container); | 1049 wm::SetSnapsChildrenToPhysicalPixelBoundary(overlay_container); |
| 1042 SetUsesScreenCoordinates(overlay_container); | 1050 SetUsesScreenCoordinates(overlay_container); |
| 1043 | 1051 |
| 1044 aura::Window* virtual_keyboard_parent_container = CreateContainer( | |
| 1045 kShellWindowId_VirtualKeyboardParentContainer, | |
| 1046 "VirtualKeyboardParentContainer", | |
| 1047 root_window); | |
| 1048 wm::SetSnapsChildrenToPhysicalPixelBoundary( | |
| 1049 virtual_keyboard_parent_container); | |
| 1050 SetUsesScreenCoordinates(virtual_keyboard_parent_container); | |
| 1051 | |
| 1052 #if defined(OS_CHROMEOS) | 1052 #if defined(OS_CHROMEOS) |
| 1053 aura::Window* mouse_cursor_container = CreateContainer( | 1053 aura::Window* mouse_cursor_container = CreateContainer( |
| 1054 kShellWindowId_MouseCursorContainer, | 1054 kShellWindowId_MouseCursorContainer, |
| 1055 "MouseCursorContainer", | 1055 "MouseCursorContainer", |
| 1056 root_window); | 1056 root_window); |
| 1057 SetUsesScreenCoordinates(mouse_cursor_container); | 1057 SetUsesScreenCoordinates(mouse_cursor_container); |
| 1058 #endif | 1058 #endif |
| 1059 | 1059 |
| 1060 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 1060 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
| 1061 "PowerButtonAnimationContainer", root_window); | 1061 "PowerButtonAnimationContainer", root_window); |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 1083 else | 1083 else |
| 1084 DisableTouchHudProjection(); | 1084 DisableTouchHudProjection(); |
| 1085 } | 1085 } |
| 1086 | 1086 |
| 1087 RootWindowController* GetRootWindowController( | 1087 RootWindowController* GetRootWindowController( |
| 1088 const aura::Window* root_window) { | 1088 const aura::Window* root_window) { |
| 1089 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1089 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
| 1090 } | 1090 } |
| 1091 | 1091 |
| 1092 } // namespace ash | 1092 } // namespace ash |
| OLD | NEW |