ash/root_window_controller.cc - Issue 1921883002: Removes WindowState::aura_window()

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 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix windows build Created 4 years, 8 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 2c1f7f061b3a56b153a3216baed61f3b9070e4d0..c377b655d711afb845406639724fb18dbd0f5e1f 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -812,8 +812,7 @@ void RootWindowController::InitLayoutManagers() {

// Create Docked windows layout manager

wm::WmWindow* docked_container =

wm::WmWindowAura::Get(GetContainer(kShellWindowId_DockedContainer));

- docked_layout_manager_ =

- new DockedWindowLayoutManager(docked_container, workspace_controller());

+ docked_layout_manager_ = new DockedWindowLayoutManager(docked_container);

docked_container->SetLayoutManager(base::WrapUnique(docked_layout_manager_));

// Installs SnapLayoutManager to containers who set the

« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/shell.cc » ('j') | no next file with comments »