ash/shell/shell_delegate_impl.cc - Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu

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/shell/shell_delegate_impl.cc

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 11 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/shell/shell_delegate_impl.cc

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc

index 6c958391cbd1555a6197a1e79cfdba15e5c58362..f3d81ee82075e69e7efab84d48b5c0b5b3af2371 100644

--- a/ash/shell/shell_delegate_impl.cc

+++ b/ash/shell/shell_delegate_impl.cc

@@ -158,7 +158,10 @@ aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {

return NULL;

}

-ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::Window* root) {

+ui::MenuModel* ShellDelegateImpl::CreateContextMenu(

+ aura::Window* root,

+ ash::ShelfItemDelegate* item_delegate,

+ ash::LauncherItem* item) {

return new ContextMenu(root);

}