chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h - Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem. (Closed)

Patch Set: Cleanup; fix ash_shell compile and a couple tests. Created 3 years, 9 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

index c36de2bdc6b73074a3bb943a5e4d6bec4b745aa0..42074b21569f427f968d3d4c0de6d8dfea9dd53c 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

@@ -54,7 +54,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {

bool allow_minimize) override;

void ActiveUserChanged(const std::string& user_email) override;

void AdditionalUserAddedToSession(Profile* profile) override;

- ash::ShelfAppMenuItemList GetAppMenuItemsForTesting(

+ ash::ShelfItemDelegate::MenuItemList GetAppMenuItemsForTesting(

const ash::ShelfItem& item) override;

std::vector<content::WebContents*> GetV1ApplicationsFromAppId(

const std::string& app_id) override;