ash/root_window_controller.cc - Issue 1812013003: Pass shelf instances, not root windows, for ash context menus.

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 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Call OnShelfAlignmentChanged after LayoutShelf. Created 4 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:

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

Download patch

Index: ash/root_window_controller.cc

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

index 4d021bfed6473ded9c972c76f5fe0115dd86d377..a2d8219fc72ff44a9f43147c2d3836b57e3d3122 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

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

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

DCHECK(delegate);

scoped_ptr<ui::MenuModel> menu_model(

- delegate->CreateContextMenu(GetRootWindow(), nullptr));

+ delegate->CreateContextMenu(shelf_->shelf(), nullptr));

if (!menu_model)

return;

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