| 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 86827f8161fb567e6099c6fbab1b3ac3b8f3cd84..0fcf87e78a1a493a0825fcc7d5762208ada6f767 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
|
| @@ -61,7 +61,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
|
| ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
|
| ash::NewWindowDelegate* CreateNewWindowDelegate() override;
|
| ash::MediaDelegate* CreateMediaDelegate() override;
|
| - ui::MenuModel* CreateContextMenu(aura::Window* root_window,
|
| + ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
|
| const ash::ShelfItem* item) override;
|
| ash::GPUSupport* CreateGPUSupport() override;
|
| base::string16 GetProductName() const override;
|
|
|