| Index: ash/shell/shell_delegate_impl.h
|
| diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
|
| index 473c42c5dbc8664237716520ba3647c10ef9a40e..92c19815b48432e76119cca4f600f2b84107a1ef 100644
|
| --- a/ash/shell/shell_delegate_impl.h
|
| +++ b/ash/shell/shell_delegate_impl.h
|
| @@ -55,7 +55,9 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
|
| virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
|
| virtual ui::MenuModel* CreateContextMenu(
|
| - aura::Window* root_window) OVERRIDE;
|
| + aura::Window* root_window,
|
| + ash::ShelfItemDelegate* item_delegate,
|
| + ash::LauncherItem* item) OVERRIDE;
|
| virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
|
| virtual base::string16 GetProductName() const OVERRIDE;
|
|
|
|
|