chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc - Issue 2046843005: mash: Migrate shelf menus to wm common types

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

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ash_shell_with_content Created 4 years, 6 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/extension_launcher_context_menu.cc

diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

index 099127eda54a9c67babc9404ecbc52e3b4515696..f8f5e2d4589a83a3f24110340e7ca25beef68b7a 100644

--- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

+++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

@@ -5,7 +5,6 @@

#include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"

#include "ash/common/shelf/shelf_item_delegate.h"

-#include "ash/shelf/shelf.h"

#include "ash/shell.h"

#include "base/bind.h"

#include "chrome/browser/extensions/context_menu_matcher.h"

@@ -31,8 +30,8 @@ bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {

ExtensionLauncherContextMenu::ExtensionLauncherContextMenu(

ChromeLauncherController* controller,

const ash::ShelfItem* item,

- ash::Shelf* shelf)

- : LauncherContextMenu(controller, item, shelf) {

+ ash::WmShelf* wm_shelf)

+ : LauncherContextMenu(controller, item, wm_shelf) {

Init();

}