| Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| index dc76edc10c8ac4e36edd1b70d0c7522d826d7fff..5d1d12018814a9dd1851a484e1f7c59b71cbbfac 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -127,12 +127,18 @@ aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
|
| return new UserActionHandler;
|
| }
|
|
|
| -ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) {
|
| +ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
|
| + aura::Window* root,
|
| + ash::ShelfItemDelegate* item_delegate,
|
| + ash::LauncherItem* item) {
|
| DCHECK(shelf_delegate_);
|
| // Don't show context menu for exclusive app runtime mode.
|
| if (chrome::IsRunningInAppMode())
|
| return NULL;
|
|
|
| + if (item_delegate && item)
|
| + return new LauncherContextMenu(shelf_delegate_, item_delegate, item, root);
|
| +
|
| return new LauncherContextMenu(shelf_delegate_, root);
|
| }
|
|
|
|
|