ash/mus/bridge/wm_shell_mus.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/bridge/wm_shell_mus.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/bridge/wm_shell_mus.cc

diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc

index 0ca14db4c4edbcaddb4c017a4c0ae59b114530bb..6c42ca318b2511a8f6fbb49a1166f872ad9a3647 100644

--- a/ash/mus/bridge/wm_shell_mus.cc

+++ b/ash/mus/bridge/wm_shell_mus.cc

@@ -92,8 +92,10 @@ class SessionStateDelegateStub : public SessionStateDelegate {

} // namespace

-WmShellMus::WmShellMus(::ui::WindowTreeClient* client)

- : client_(client), session_state_delegate_(new SessionStateDelegateStub) {

+WmShellMus::WmShellMus(ShellDelegate* delegate, ::ui::WindowTreeClient* client)

+ : WmShell(delegate),

+ client_(client),

+ session_state_delegate_(new SessionStateDelegateStub) {

client_->AddObserver(this);

WmShell::Set(this);

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