ash/mus/window_manager.cc - Issue 2187703003: Wires up registering accelerators from mash with the wm

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 2187703003: Wires up registering accelerators from mash with the wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 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 b9640f6f340eb0d8296e68a2cfd84e709f5556f1..c72d7f5e62dad7af2db745c48edaea7694090741 100644

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

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

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

std::unique_ptr<ShellDelegate> shell_delegate(new ShellDelegateMus(

base::MakeUnique<AppListPresenterStub>(), connector_));

- shell_.reset(new WmShellMus(std::move(shell_delegate), window_tree_client_));

+ shell_.reset(new WmShellMus(std::move(shell_delegate), this));

shell_->Initialize();

lookup_.reset(new WmLookupMus);

}

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