| Index: ash/shell/shell_delegate_impl.h
|
| diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
|
| index af66b988c643b146b82f5490565d8421e64e89c3..6bcd838f85cc647c989dcda580ddc420982902b1 100644
|
| --- a/ash/shell/shell_delegate_impl.h
|
| +++ b/ash/shell/shell_delegate_impl.h
|
| @@ -58,8 +58,8 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override;
|
| std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
|
| override;
|
| - ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
|
| - const ash::ShelfItem* item) override;
|
| + ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
|
| + const ShelfItem* item) override;
|
| GPUSupport* CreateGPUSupport() override;
|
| base::string16 GetProductName() const override;
|
| gfx::Image GetDeprecatedAcceleratorImage() const override;
|
|
|