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

Side by Side Diff: ash/common/wm_root_window_controller.cc

Issue 2352153002: Moves creation of LockLayoutManager to common code (Closed)
Patch Set: merge Created 4 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
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('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 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"
11 #include "ash/common/wallpaper/wallpaper_delegate.h" 11 #include "ash/common/wallpaper/wallpaper_delegate.h"
12 #include "ash/common/wallpaper/wallpaper_widget_controller.h" 12 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
13 #include "ash/common/wm/container_finder.h" 13 #include "ash/common/wm/container_finder.h"
14 #include "ash/common/wm/lock_layout_manager.h"
14 #include "ash/common/wm/root_window_layout_manager.h" 15 #include "ash/common/wm/root_window_layout_manager.h"
15 #include "ash/common/wm/system_modal_container_layout_manager.h" 16 #include "ash/common/wm/system_modal_container_layout_manager.h"
16 #include "ash/common/wm/window_state.h" 17 #include "ash/common/wm/window_state.h"
17 #include "ash/common/wm/workspace/workspace_layout_manager.h" 18 #include "ash/common/wm/workspace/workspace_layout_manager.h"
18 #include "ash/common/wm/workspace_controller.h" 19 #include "ash/common/wm/workspace_controller.h"
19 #include "ash/common/wm_shell.h" 20 #include "ash/common/wm_shell.h"
20 #include "ash/common/wm_window.h" 21 #include "ash/common/wm_window.h"
21 #include "base/memory/ptr_util.h" 22 #include "base/memory/ptr_util.h"
22 #include "ui/base/models/menu_model.h" 23 #include "ui/base/models/menu_model.h"
23 #include "ui/views/controls/menu/menu_model_adapter.h" 24 #include "ui/views/controls/menu/menu_model_adapter.h"
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 DCHECK(modal_container); 434 DCHECK(modal_container);
434 modal_container->SetLayoutManager( 435 modal_container->SetLayoutManager(
435 base::MakeUnique<SystemModalContainerLayoutManager>(modal_container)); 436 base::MakeUnique<SystemModalContainerLayoutManager>(modal_container));
436 437
437 WmWindow* lock_modal_container = 438 WmWindow* lock_modal_container =
438 GetContainer(kShellWindowId_LockSystemModalContainer); 439 GetContainer(kShellWindowId_LockSystemModalContainer);
439 DCHECK(lock_modal_container); 440 DCHECK(lock_modal_container);
440 lock_modal_container->SetLayoutManager( 441 lock_modal_container->SetLayoutManager(
441 base::MakeUnique<SystemModalContainerLayoutManager>( 442 base::MakeUnique<SystemModalContainerLayoutManager>(
442 lock_modal_container)); 443 lock_modal_container));
444
445 WmWindow* lock_container = GetContainer(kShellWindowId_LockScreenContainer);
446 DCHECK(lock_container);
447 lock_container->SetLayoutManager(
448 base::MakeUnique<LockLayoutManager>(lock_container));
443 } 449 }
444 450
445 void WmRootWindowController::DeleteWorkspaceController() { 451 void WmRootWindowController::DeleteWorkspaceController() {
446 workspace_controller_.reset(); 452 workspace_controller_.reset();
447 } 453 }
448 454
449 void WmRootWindowController::OnMenuClosed() { 455 void WmRootWindowController::OnMenuClosed() {
450 menu_runner_.reset(); 456 menu_runner_.reset();
451 menu_model_adapter_.reset(); 457 menu_model_adapter_.reset();
452 menu_model_.reset(); 458 menu_model_.reset();
453 GetShelf()->UpdateVisibilityState(); 459 GetShelf()->UpdateVisibilityState();
454 } 460 }
455 461
456 } // namespace ash 462 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698