ash/mus/window_manager.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/mus/window_manager.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

Index: ash/mus/window_manager.cc

diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc

index 3f11af23b86cb72b530d135b27f477c807baf898..880422b5173e6a0cc0ddea3eee0960d8feff7f8e 100644

--- a/ash/mus/window_manager.cc

+++ b/ash/mus/window_manager.cc

@@ -68,7 +68,8 @@ void WindowManager::Init(::ui::WindowTreeClient* window_tree_client) {

window_manager_client_->SetFrameDecorationValues(

std::move(frame_decoration_values));

- shell_.reset(new WmShellMus(window_tree_client_));

+ // TODO(msw): Provide a valid ShellDelegate here; maybe port ShellDelegateMus?

+ shell_.reset(new WmShellMus(nullptr, window_tree_client_));

lookup_.reset(new WmLookupMus);

}

« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »