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

Side by Side Diff: ash/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 | « ash/common/wm_root_window_controller.cc ('k') | no next file » | 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/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
(...skipping 13 matching lines...) Expand all
24 #include "ash/common/shell_window_ids.h" 24 #include "ash/common/shell_window_ids.h"
25 #include "ash/common/system/status_area_layout_manager.h" 25 #include "ash/common/system/status_area_layout_manager.h"
26 #include "ash/common/system/status_area_widget.h" 26 #include "ash/common/system/status_area_widget.h"
27 #include "ash/common/system/tray/system_tray_delegate.h" 27 #include "ash/common/system/tray/system_tray_delegate.h"
28 #include "ash/common/wallpaper/wallpaper_delegate.h" 28 #include "ash/common/wallpaper/wallpaper_delegate.h"
29 #include "ash/common/wallpaper/wallpaper_widget_controller.h" 29 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
30 #include "ash/common/wm/always_on_top_controller.h" 30 #include "ash/common/wm/always_on_top_controller.h"
31 #include "ash/common/wm/container_finder.h" 31 #include "ash/common/wm/container_finder.h"
32 #include "ash/common/wm/dock/docked_window_layout_manager.h" 32 #include "ash/common/wm/dock/docked_window_layout_manager.h"
33 #include "ash/common/wm/fullscreen_window_finder.h" 33 #include "ash/common/wm/fullscreen_window_finder.h"
34 #include "ash/common/wm/lock_layout_manager.h"
35 #include "ash/common/wm/panels/panel_layout_manager.h" 34 #include "ash/common/wm/panels/panel_layout_manager.h"
36 #include "ash/common/wm/root_window_layout_manager.h" 35 #include "ash/common/wm/root_window_layout_manager.h"
37 #include "ash/common/wm/switchable_windows.h" 36 #include "ash/common/wm/switchable_windows.h"
38 #include "ash/common/wm/system_modal_container_layout_manager.h" 37 #include "ash/common/wm/system_modal_container_layout_manager.h"
39 #include "ash/common/wm/window_state.h" 38 #include "ash/common/wm/window_state.h"
40 #include "ash/common/wm/workspace/workspace_layout_manager.h" 39 #include "ash/common/wm/workspace/workspace_layout_manager.h"
41 #include "ash/common/wm/workspace_controller.h" 40 #include "ash/common/wm/workspace_controller.h"
42 #include "ash/common/wm_shell.h" 41 #include "ash/common/wm_shell.h"
43 #include "ash/common/wm_window.h" 42 #include "ash/common/wm_window.h"
44 #include "ash/display/display_manager.h" 43 #include "ash/display/display_manager.h"
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 touch_exploration_manager_.reset(new AshTouchExplorationManager(this)); 609 touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
611 } 610 }
612 #endif 611 #endif
613 } 612 }
614 613
615 void RootWindowController::InitLayoutManagers() { 614 void RootWindowController::InitLayoutManagers() {
616 wm_root_window_controller_->CreateLayoutManagers(); 615 wm_root_window_controller_->CreateLayoutManagers();
617 616
618 aura::Window* root_window = GetRootWindow(); 617 aura::Window* root_window = GetRootWindow();
619 618
620 WmWindow* lock_container = WmWindowAura::Get(
621 root_window->GetChildById(kShellWindowId_LockScreenContainer));
622 DCHECK(lock_container);
623 lock_container->SetLayoutManager(
624 base::MakeUnique<LockLayoutManager>(lock_container));
625
626 WmWindow* always_on_top_container = 619 WmWindow* always_on_top_container =
627 WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer)); 620 WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer));
628 always_on_top_controller_.reset( 621 always_on_top_controller_.reset(
629 new AlwaysOnTopController(always_on_top_container)); 622 new AlwaysOnTopController(always_on_top_container));
630 623
631 // Create the shelf and status area widgets. 624 // Create the shelf and status area widgets.
632 DCHECK(!wm_shelf_aura_->shelf_widget()); 625 DCHECK(!wm_shelf_aura_->shelf_widget());
633 aura::Window* shelf_container = GetContainer(kShellWindowId_ShelfContainer); 626 aura::Window* shelf_container = GetContainer(kShellWindowId_ShelfContainer);
634 aura::Window* status_container = GetContainer(kShellWindowId_StatusContainer); 627 aura::Window* status_container = GetContainer(kShellWindowId_StatusContainer);
635 WmWindow* wm_shelf_container = WmWindowAura::Get(shelf_container); 628 WmWindow* wm_shelf_container = WmWindowAura::Get(shelf_container);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 EnableTouchHudProjection(); 730 EnableTouchHudProjection();
738 else 731 else
739 DisableTouchHudProjection(); 732 DisableTouchHudProjection();
740 } 733 }
741 734
742 RootWindowController* GetRootWindowController(const aura::Window* root_window) { 735 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
743 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr; 736 return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
744 } 737 }
745 738
746 } // namespace ash 739 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_root_window_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698