ash/mus/shell_delegate_mus.cc - Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash.

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/shell_delegate_mus.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)

Patch Set: Fix and workaround test issues. Created 4 years, 2 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/mus/shell_delegate_mus.cc

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

index aa14e7f7f995874b6dc5889256f25ffc27d9c940..8dd3c02d7c40237a40d72eb246c7dc657dceac74 100644

--- a/ash/mus/shell_delegate_mus.cc

+++ b/ash/mus/shell_delegate_mus.cc

@@ -175,7 +175,7 @@ app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {

}

ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {

- return new ShelfDelegateMus(WmShell::Get()->shelf_model());

+ return new ShelfDelegateMus();

}

SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {