ash/root_window_controller.cc - Issue 2354533004: Ports LockLayoutManager/LockWindowState to ash/common

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/root_window_controller.cc

Issue 2354533004: Ports LockLayoutManager/LockWindowState to ash/common (Closed)

Patch Set: 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:

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index 3829e11a61588c91e89b8d84e6d90a5c8e87fd15..caac66a71de7efb962fd46a6bdbe94664d9c6f58 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -31,6 +31,7 @@

#include "ash/common/wm/container_finder.h"

#include "ash/common/wm/dock/docked_window_layout_manager.h"

#include "ash/common/wm/fullscreen_window_finder.h"

+#include "ash/common/wm/lock_layout_manager.h"

#include "ash/common/wm/panels/panel_layout_manager.h"

#include "ash/common/wm/root_window_layout_manager.h"

#include "ash/common/wm/switchable_windows.h"

@@ -49,7 +50,6 @@

#include "ash/touch/touch_hud_debug.h"

#include "ash/touch/touch_hud_projection.h"

#include "ash/touch/touch_observer_hud.h"

-#include "ash/wm/lock_layout_manager.h"

#include "ash/wm/panels/attached_panel_window_targeter.h"

#include "ash/wm/panels/panel_window_event_handler.h"

#include "ash/wm/stacking_controller.h"

@@ -617,10 +617,11 @@ void RootWindowController::InitLayoutManagers() {

aura::Window* root_window = GetRootWindow();

- aura::Window* lock_container =

- root_window->GetChildById(kShellWindowId_LockScreenContainer);

+ WmWindow* lock_container = WmWindowAura::Get(

+ root_window->GetChildById(kShellWindowId_LockScreenContainer));

DCHECK(lock_container);

- lock_container->SetLayoutManager(new LockLayoutManager(lock_container));

+ lock_container->SetLayoutManager(

James Cook 2016/09/20 18:22:47 Does this need to happen in ash/mus/root_window_co

+ base::MakeUnique<LockLayoutManager>(lock_container));

WmWindow* always_on_top_container =

WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer));