diff options
Diffstat (limited to 'ash/mus')
-rw-r--r-- | ash/mus/shelf_delegate_mus.cc | 5 | ||||
-rw-r--r-- | ash/mus/shell_delegate_mus.cc | 6 | ||||
-rw-r--r-- | ash/mus/shell_delegate_mus.h | 3 |
3 files changed, 3 insertions, 11 deletions
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc index c405fb7..ce3698a 100644 --- a/ash/mus/shelf_delegate_mus.cc +++ b/ash/mus/shelf_delegate_mus.cc @@ -51,11 +51,6 @@ class ShelfItemDelegateMus : public ShelfItemDelegate { base::string16 GetTitle() override { return title_; } - ui::MenuModel* CreateContextMenu(aura::Window* root_window) override { - NOTIMPLEMENTED(); - return nullptr; - } - bool CanPin() const override { NOTIMPLEMENTED(); return false; diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc index f2c0de4..4aa6e13 100644 --- a/ash/mus/shell_delegate_mus.cc +++ b/ash/mus/shell_delegate_mus.cc @@ -197,10 +197,8 @@ MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { return new MediaDelegateStub; } -ui::MenuModel* ShellDelegateMus::CreateContextMenu( - aura::Window* root_window, - ShelfItemDelegate* item_delegate, - ShelfItem* item) { +ui::MenuModel* ShellDelegateMus::CreateContextMenu(aura::Window* root_window, + const ShelfItem* item) { NOTIMPLEMENTED(); return nullptr; } diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h index a9ca638..f0486ab 100644 --- a/ash/mus/shell_delegate_mus.h +++ b/ash/mus/shell_delegate_mus.h @@ -47,8 +47,7 @@ class ShellDelegateMus : public ash::ShellDelegate { ash::NewWindowDelegate* CreateNewWindowDelegate() override; ash::MediaDelegate* CreateMediaDelegate() override; ui::MenuModel* CreateContextMenu(aura::Window* root_window, - ash::ShelfItemDelegate* item_delegate, - ash::ShelfItem* item) override; + const ash::ShelfItem* item) override; GPUSupport* CreateGPUSupport() override; base::string16 GetProductName() const override; gfx::Image GetDeprecatedAcceleratorImage() const override; |