4 files changed, 5 insertions, 13 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index a53be83..d996a22 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -225,10 +225,9 @@ ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
 }
 
 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
-    aura::Window* root,
-    ash::ShelfItemDelegate* item_delegate,
-    ash::ShelfItem* item) {
-  return new ContextMenu(root);
+    aura::Window* root_window,
+    const ash::ShelfItem* item) {
+  return new ContextMenu(root_window);
 }
 
 GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index dbcaa59..c53c702 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -49,8 +49,7 @@ class ShellDelegateImpl : 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;
diff --git a/ash/shell/window_watcher_shelf_item_delegate.cc b/ash/shell/window_watcher_shelf_item_delegate.cc
index 2d4d2ca..ca33759 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.cc
+++ b/ash/shell/window_watcher_shelf_item_delegate.cc
@@ -36,14 +36,9 @@ base::string16 WindowWatcherShelfItemDelegate::GetTitle() {
   return watcher_->GetWindowByID(id_)->title();
 }
 
-ui::MenuModel* WindowWatcherShelfItemDelegate::CreateContextMenu(
-    aura::Window* root_window) {
-  return NULL;
-}
-
 ShelfMenuModel* WindowWatcherShelfItemDelegate::CreateApplicationMenu(
     int event_flags) {
-  return NULL;
+  return nullptr;
 }
 
 bool WindowWatcherShelfItemDelegate::IsDraggable() {
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index a9fbc0ea..2bbc05b 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -25,7 +25,6 @@ class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
   ShelfItemDelegate::PerformedAction ItemSelected(
       const ui::Event& event) override;
   base::string16 GetTitle() override;
-  ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
   ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
   bool IsDraggable() override;
   bool CanPin() const override;