ash/sysui/shell_delegate_mus.cc - Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo: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/sysui/shell_delegate_mus.cc

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 4 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/sysui/shell_delegate_mus.cc

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

index 26cad2f97723623e1809bbb29104b876b3c2ea3c..214a627c98608a59dfa75ff14adb2312a28e5090 100644

--- a/ash/sysui/shell_delegate_mus.cc

+++ b/ash/sysui/shell_delegate_mus.cc

@@ -10,9 +10,7 @@

#include "ash/common/palette_delegate.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/system/tray/default_system_tray_delegate.h"

-#include "ash/mus/context_menu_mus.h"

#include "ash/sysui/app_list_presenter_mus.h"

-#include "ash/sysui/shelf_delegate_mus.h"

#include "ash/sysui/wallpaper_delegate_mus.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

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

}

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

- return new ShelfDelegateMus(model);

+ return nullptr;

}

SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {

« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | ash/sysui/sysui_application.h » ('j') | no next file with comments »