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: Add EnumTraits for shelf alignment and auto-hide behavior. 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

« ash/public/interfaces/shelf.mojom ('K') | « ash/sysui/shelf_delegate_mus.cc ('k') | ash/sysui/sysui_application.h » ('j') | chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/sysui/shell_delegate_mus.cc

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

index 68a99c77f41cee27af5fb65aa96b39e3c5df8dcb..1e3779a916b456e855f49ad1006e9bec6fb5c232 100644

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

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

@@ -13,7 +13,6 @@

#include "ash/sysui/app_list_presenter_mus.h"

#include "ash/sysui/context_menu_mus.h"

#include "ash/sysui/pointer_watcher_delegate_mus.h"

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

#include "ash/sysui/user_wallpaper_delegate_mus.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

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

}

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

- return new ShelfDelegateMus(model);

+ return nullptr;

}

SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {