Pass shelf instances, not root windows, for ash context menus.

ash/shell_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_DELEGATE_H_
 #define ASH_SHELL_DELEGATE_H_
 
 #include <string>
 
 #include "ash/ash_export.h"
@@ skipping 24 matching lines @@
 namespace ash {
 
 class AccessibilityDelegate;
 class MediaDelegate;
 class NewWindowDelegate;
 class SessionStateDelegate;
 class ShelfDelegate;
 class ShelfModel;
 class SystemTrayDelegate;
 class UserWallpaperDelegate;
+class Shelf;
 struct ShelfItem;
 
 class ASH_EXPORT VirtualKeyboardStateObserver {
  public:
   // Called when keyboard is activated/deactivated.
   virtual void OnVirtualKeyboardStateChanged(bool activated) {}
 
  protected:
   virtual ~VirtualKeyboardStateObserver() {}
 };
@@ skipping 70 matching lines @@
 
   // Creates a accessibility delegate. Shell takes ownership of the delegate.
   virtual AccessibilityDelegate* CreateAccessibilityDelegate() = 0;
 
   // Creates an application delegate. Shell takes ownership of the delegate.
   virtual NewWindowDelegate* CreateNewWindowDelegate() = 0;
 
   // Creates a media delegate. Shell takes ownership of the delegate.
   virtual MediaDelegate* CreateMediaDelegate() = 0;
 
-  // Creates a menu model for the |root_window| and optional shelf |item|.
+  // Creates a menu model for the |shelf| and optional shelf |item|.
   // If |item| is null, this creates a context menu for the desktop or shelf.
-  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window,
+  virtual ui::MenuModel* CreateContextMenu(ash::Shelf* shelf,
                                            const ash::ShelfItem* item) = 0;
 
   // Creates a GPU support object. Shell takes ownership of the object.
   virtual GPUSupport* CreateGPUSupport() = 0;
 
   // Get the product name.
   virtual base::string16 GetProductName() const = 0;
 
   virtual void OpenKeyboardShortcutHelpPage() const {}
 
   virtual gfx::Image GetDeprecatedAcceleratorImage() const = 0;
 
   // Toggles the status of the touchpad / touchscreen on or off.
   virtual void ToggleTouchpad() {}
   virtual void ToggleTouchscreen() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_DELEGATE_H_