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

Side by Side Diff: ash/root_window_controller.cc

Issue 565373002: Move virtual keyboard behind context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup. Created 6 years, 3 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
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 void RootWindowController::CreateForVirtualKeyboardDisplay( 277 void RootWindowController::CreateForVirtualKeyboardDisplay(
278 AshWindowTreeHost* host) { 278 AshWindowTreeHost* host) {
279 RootWindowController* controller = new RootWindowController(host); 279 RootWindowController* controller = new RootWindowController(host);
280 controller->Init(RootWindowController::VIRTUAL_KEYBOARD, 280 controller->Init(RootWindowController::VIRTUAL_KEYBOARD,
281 false /* first run */); 281 false /* first run */);
282 } 282 }
283 283
284 // static 284 // static
285 RootWindowController* RootWindowController::ForShelf( 285 RootWindowController* RootWindowController::ForShelf(
286 const aura::Window* window) { 286 const aura::Window* window) {
287 CHECK(Shell::HasInstance()); 287 CHECK(Shell::HasInstance());
James Cook 2014/09/15 17:45:20 Do you need these for this CL? Do they need to be
kevers 2014/09/16 14:53:12 Sorry, missed this comment earlier. ForShelf is n
288 return GetRootWindowController(window->GetRootWindow()); 288 return GetRootWindowController(window->GetRootWindow());
289 } 289 }
290 290
291 // static 291 // static
292 RootWindowController* RootWindowController::ForWindow( 292 RootWindowController* RootWindowController::ForWindow(
293 const aura::Window* window) { 293 const aura::Window* window) {
294 CHECK(Shell::HasInstance()); 294 CHECK(Shell::HasInstance());
295 return GetRootWindowController(window->GetRootWindow()); 295 return GetRootWindowController(window->GetRootWindow());
296 } 296 }
297 297
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 1014
1015 aura::Window* settings_bubble_container = CreateContainer( 1015 aura::Window* settings_bubble_container = CreateContainer(
1016 kShellWindowId_SettingBubbleContainer, 1016 kShellWindowId_SettingBubbleContainer,
1017 "SettingBubbleContainer", 1017 "SettingBubbleContainer",
1018 lock_screen_related_containers); 1018 lock_screen_related_containers);
1019 ::wm::SetChildWindowVisibilityChangesAnimated(settings_bubble_container); 1019 ::wm::SetChildWindowVisibilityChangesAnimated(settings_bubble_container);
1020 wm::SetSnapsChildrenToPhysicalPixelBoundary(settings_bubble_container); 1020 wm::SetSnapsChildrenToPhysicalPixelBoundary(settings_bubble_container);
1021 SetUsesScreenCoordinates(settings_bubble_container); 1021 SetUsesScreenCoordinates(settings_bubble_container);
1022 DescendantShouldStayInSameRootWindow(settings_bubble_container); 1022 DescendantShouldStayInSameRootWindow(settings_bubble_container);
1023 1023
1024 aura::Window* virtual_keyboard_parent_container =
1025 CreateContainer(kShellWindowId_VirtualKeyboardParentContainer,
1026 "VirtualKeyboardParentContainer",
1027 lock_screen_related_containers);
1028 wm::SetSnapsChildrenToPhysicalPixelBoundary(
1029 virtual_keyboard_parent_container);
1030 SetUsesScreenCoordinates(virtual_keyboard_parent_container);
1031
1024 aura::Window* menu_container = CreateContainer( 1032 aura::Window* menu_container = CreateContainer(
1025 kShellWindowId_MenuContainer, 1033 kShellWindowId_MenuContainer,
1026 "MenuContainer", 1034 "MenuContainer",
1027 lock_screen_related_containers); 1035 lock_screen_related_containers);
1028 ::wm::SetChildWindowVisibilityChangesAnimated(menu_container); 1036 ::wm::SetChildWindowVisibilityChangesAnimated(menu_container);
1029 wm::SetSnapsChildrenToPhysicalPixelBoundary(menu_container); 1037 wm::SetSnapsChildrenToPhysicalPixelBoundary(menu_container);
1030 SetUsesScreenCoordinates(menu_container); 1038 SetUsesScreenCoordinates(menu_container);
1031 1039
1032 aura::Window* drag_drop_container = CreateContainer( 1040 aura::Window* drag_drop_container = CreateContainer(
1033 kShellWindowId_DragImageAndTooltipContainer, 1041 kShellWindowId_DragImageAndTooltipContainer,
1034 "DragImageAndTooltipContainer", 1042 "DragImageAndTooltipContainer",
1035 lock_screen_related_containers); 1043 lock_screen_related_containers);
1036 ::wm::SetChildWindowVisibilityChangesAnimated(drag_drop_container); 1044 ::wm::SetChildWindowVisibilityChangesAnimated(drag_drop_container);
1037 wm::SetSnapsChildrenToPhysicalPixelBoundary(drag_drop_container); 1045 wm::SetSnapsChildrenToPhysicalPixelBoundary(drag_drop_container);
1038 SetUsesScreenCoordinates(drag_drop_container); 1046 SetUsesScreenCoordinates(drag_drop_container);
1039 1047
1040 aura::Window* overlay_container = CreateContainer( 1048 aura::Window* overlay_container = CreateContainer(
1041 kShellWindowId_OverlayContainer, 1049 kShellWindowId_OverlayContainer,
1042 "OverlayContainer", 1050 "OverlayContainer",
1043 lock_screen_related_containers); 1051 lock_screen_related_containers);
1044 wm::SetSnapsChildrenToPhysicalPixelBoundary(overlay_container); 1052 wm::SetSnapsChildrenToPhysicalPixelBoundary(overlay_container);
1045 SetUsesScreenCoordinates(overlay_container); 1053 SetUsesScreenCoordinates(overlay_container);
1046 1054
1047 aura::Window* virtual_keyboard_parent_container = CreateContainer(
1048 kShellWindowId_VirtualKeyboardParentContainer,
1049 "VirtualKeyboardParentContainer",
1050 root_window);
1051 wm::SetSnapsChildrenToPhysicalPixelBoundary(
1052 virtual_keyboard_parent_container);
1053 SetUsesScreenCoordinates(virtual_keyboard_parent_container);
1054
1055 #if defined(OS_CHROMEOS) 1055 #if defined(OS_CHROMEOS)
1056 aura::Window* mouse_cursor_container = CreateContainer( 1056 aura::Window* mouse_cursor_container = CreateContainer(
1057 kShellWindowId_MouseCursorContainer, 1057 kShellWindowId_MouseCursorContainer,
1058 "MouseCursorContainer", 1058 "MouseCursorContainer",
1059 root_window); 1059 root_window);
1060 SetUsesScreenCoordinates(mouse_cursor_container); 1060 SetUsesScreenCoordinates(mouse_cursor_container);
1061 #endif 1061 #endif
1062 1062
1063 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 1063 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
1064 "PowerButtonAnimationContainer", root_window); 1064 "PowerButtonAnimationContainer", root_window);
(...skipping 21 matching lines...) Expand all
1086 else 1086 else
1087 DisableTouchHudProjection(); 1087 DisableTouchHudProjection();
1088 } 1088 }
1089 1089
1090 RootWindowController* GetRootWindowController( 1090 RootWindowController* GetRootWindowController(
1091 const aura::Window* root_window) { 1091 const aura::Window* root_window) {
1092 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1092 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1093 } 1093 }
1094 1094
1095 } // namespace ash 1095 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/root_window_controller_unittest.cc » ('j') | ash/root_window_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698