ash/root_window_controller.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: ash/root_window_controller.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: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index a627d23b49a6b49603bd35f3783c4502a985207f..4909168f2cb61df2a22ee86fee64550e95f644bb 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -566,8 +566,7 @@ void RootWindowController::ShowContextMenu(const gfx::Point& location_in_screen,

ui::MenuSourceType source_type) {

ShellDelegate* delegate = Shell::GetInstance()->delegate();

DCHECK(delegate);

- menu_model_.reset(

- delegate->CreateContextMenu(shelf_widget_->shelf(), nullptr));

+ menu_model_.reset(delegate->CreateContextMenu(wm_shelf_aura_.get(), nullptr));

if (!menu_model_)

return;

« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »