OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/common/wm_root_window_controller.h" | 5 #include "ash/common/wm_root_window_controller.h" |
6 | 6 |
7 #include "ash/common/session/session_state_delegate.h" | 7 #include "ash/common/session/session_state_delegate.h" |
8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/common/shell_delegate.h" | 9 #include "ash/common/shell_delegate.h" |
10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 docked_container->SetBoundsInScreenBehaviorForChildren( | 201 docked_container->SetBoundsInScreenBehaviorForChildren( |
202 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 202 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
203 docked_container->SetChildrenUseExtendedHitRegion(); | 203 docked_container->SetChildrenUseExtendedHitRegion(); |
204 | 204 |
205 WmWindow* shelf_container = | 205 WmWindow* shelf_container = |
206 CreateContainer(kShellWindowId_ShelfContainer, "ShelfContainer", | 206 CreateContainer(kShellWindowId_ShelfContainer, "ShelfContainer", |
207 non_lock_screen_containers); | 207 non_lock_screen_containers); |
208 shelf_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 208 shelf_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
209 shelf_container->SetBoundsInScreenBehaviorForChildren( | 209 shelf_container->SetBoundsInScreenBehaviorForChildren( |
210 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 210 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
211 shelf_container->SetDescendantsStayInSameRootWindow(true); | 211 shelf_container->SetLockedToRoot(true); |
212 | 212 |
213 WmWindow* panel_container = | 213 WmWindow* panel_container = |
214 CreateContainer(kShellWindowId_PanelContainer, "PanelContainer", | 214 CreateContainer(kShellWindowId_PanelContainer, "PanelContainer", |
215 non_lock_screen_containers); | 215 non_lock_screen_containers); |
216 panel_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 216 panel_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
217 panel_container->SetBoundsInScreenBehaviorForChildren( | 217 panel_container->SetBoundsInScreenBehaviorForChildren( |
218 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 218 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
219 | 219 |
220 WmWindow* shelf_bubble_container = | 220 WmWindow* shelf_bubble_container = |
221 CreateContainer(kShellWindowId_ShelfBubbleContainer, | 221 CreateContainer(kShellWindowId_ShelfBubbleContainer, |
222 "ShelfBubbleContainer", non_lock_screen_containers); | 222 "ShelfBubbleContainer", non_lock_screen_containers); |
223 shelf_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 223 shelf_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
224 shelf_bubble_container->SetBoundsInScreenBehaviorForChildren( | 224 shelf_bubble_container->SetBoundsInScreenBehaviorForChildren( |
225 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 225 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
226 shelf_bubble_container->SetDescendantsStayInSameRootWindow(true); | 226 shelf_bubble_container->SetLockedToRoot(true); |
227 | 227 |
228 WmWindow* app_list_container = | 228 WmWindow* app_list_container = |
229 CreateContainer(kShellWindowId_AppListContainer, "AppListContainer", | 229 CreateContainer(kShellWindowId_AppListContainer, "AppListContainer", |
230 non_lock_screen_containers); | 230 non_lock_screen_containers); |
231 app_list_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 231 app_list_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
232 app_list_container->SetBoundsInScreenBehaviorForChildren( | 232 app_list_container->SetBoundsInScreenBehaviorForChildren( |
233 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 233 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
234 | 234 |
235 WmWindow* modal_container = | 235 WmWindow* modal_container = |
236 CreateContainer(kShellWindowId_SystemModalContainer, | 236 CreateContainer(kShellWindowId_SystemModalContainer, |
(...skipping 22 matching lines...) Expand all Loading... |
259 lock_modal_container->SetBoundsInScreenBehaviorForChildren( | 259 lock_modal_container->SetBoundsInScreenBehaviorForChildren( |
260 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 260 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
261 lock_modal_container->SetChildrenUseExtendedHitRegion(); | 261 lock_modal_container->SetChildrenUseExtendedHitRegion(); |
262 | 262 |
263 WmWindow* status_container = | 263 WmWindow* status_container = |
264 CreateContainer(kShellWindowId_StatusContainer, "StatusContainer", | 264 CreateContainer(kShellWindowId_StatusContainer, "StatusContainer", |
265 lock_screen_related_containers); | 265 lock_screen_related_containers); |
266 status_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 266 status_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
267 status_container->SetBoundsInScreenBehaviorForChildren( | 267 status_container->SetBoundsInScreenBehaviorForChildren( |
268 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 268 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
269 status_container->SetDescendantsStayInSameRootWindow(true); | 269 status_container->SetLockedToRoot(true); |
270 | 270 |
271 WmWindow* settings_bubble_container = | 271 WmWindow* settings_bubble_container = |
272 CreateContainer(kShellWindowId_SettingBubbleContainer, | 272 CreateContainer(kShellWindowId_SettingBubbleContainer, |
273 "SettingBubbleContainer", lock_screen_related_containers); | 273 "SettingBubbleContainer", lock_screen_related_containers); |
274 settings_bubble_container->SetChildWindowVisibilityChangesAnimated(); | 274 settings_bubble_container->SetChildWindowVisibilityChangesAnimated(); |
275 settings_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 275 settings_bubble_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
276 settings_bubble_container->SetBoundsInScreenBehaviorForChildren( | 276 settings_bubble_container->SetBoundsInScreenBehaviorForChildren( |
277 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 277 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
278 settings_bubble_container->SetDescendantsStayInSameRootWindow(true); | 278 settings_bubble_container->SetLockedToRoot(true); |
279 | 279 |
280 WmWindow* virtual_keyboard_parent_container = CreateContainer( | 280 WmWindow* virtual_keyboard_parent_container = CreateContainer( |
281 kShellWindowId_ImeWindowParentContainer, "VirtualKeyboardParentContainer", | 281 kShellWindowId_ImeWindowParentContainer, "VirtualKeyboardParentContainer", |
282 lock_screen_related_containers); | 282 lock_screen_related_containers); |
283 virtual_keyboard_parent_container->SetSnapsChildrenToPhysicalPixelBoundary(); | 283 virtual_keyboard_parent_container->SetSnapsChildrenToPhysicalPixelBoundary(); |
284 virtual_keyboard_parent_container->SetBoundsInScreenBehaviorForChildren( | 284 virtual_keyboard_parent_container->SetBoundsInScreenBehaviorForChildren( |
285 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); | 285 WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); |
286 | 286 |
287 WmWindow* menu_container = | 287 WmWindow* menu_container = |
288 CreateContainer(kShellWindowId_MenuContainer, "MenuContainer", | 288 CreateContainer(kShellWindowId_MenuContainer, "MenuContainer", |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 } | 343 } |
344 | 344 |
345 void WmRootWindowController::OnMenuClosed() { | 345 void WmRootWindowController::OnMenuClosed() { |
346 menu_runner_.reset(); | 346 menu_runner_.reset(); |
347 menu_model_adapter_.reset(); | 347 menu_model_adapter_.reset(); |
348 menu_model_.reset(); | 348 menu_model_.reset(); |
349 GetShelf()->UpdateVisibilityState(); | 349 GetShelf()->UpdateVisibilityState(); |
350 } | 350 } |
351 | 351 |
352 } // namespace ash | 352 } // namespace ash |
OLD | NEW |