| Index: chrome/browser/ui/ash/chrome_shell_delegate.h
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| index ad360e024530aa69e4320160eed6ab8c6a854448..82567d3337548170c86d9619735381db2f5baca3 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| @@ -17,6 +17,10 @@
|
|
|
| class Browser;
|
|
|
| +namespace ash {
|
| +class ShelfItemDelegate;
|
| +}
|
| +
|
| namespace content {
|
| class WebContents;
|
| }
|
| @@ -57,7 +61,10 @@ class ChromeShellDelegate : public ash::ShellDelegate,
|
| virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
|
| virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
|
| virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
|
| - virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;
|
| + virtual ui::MenuModel* CreateContextMenu(
|
| + aura::Window* root,
|
| + ash::ShelfItemDelegate* item_delegate,
|
| + ash::LauncherItem* item) OVERRIDE;
|
| virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
|
| virtual base::string16 GetProductName() const OVERRIDE;
|
|
|
|
|