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

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

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

index eea601783e280c5afbfa3f47683e5a11c11e3aa0..f8a3570c4e758c5cdebb49b76508ef6f14a6d07c 100644

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

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

@@ -372,8 +372,8 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

item.id = 1; // dummy id

item.type = shelf_item_type;

ash::Shelf* shelf = ash::Shelf::ForWindow(CurrentContext());

- std::unique_ptr<LauncherContextMenu> menu(

- LauncherContextMenu::Create(controller_, &item, shelf));

+ std::unique_ptr<LauncherContextMenu> menu(LauncherContextMenu::Create(

+ controller_, &item, ash::test::ShelfTestAPI(shelf).wm_shelf()));

return menu;

}