Add Wallpaper option to launcher context menu

ash/shell.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_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 78 matching lines @@
 class MouseCursorEventFilter;
 class OutputConfiguratorAnimation;
 class OverlayEventFilter;
 class PanelLayoutManager;
 class ResizeShadowController;
 class RootWindowController;
 class RootWindowLayoutManager;
 class ScreenPositionController;
 class ShadowController;
 class ShelfLayoutManager;
-class ShellContextMenu;
 class SlowAnimationEventFilter;
 class StackingController;
 class StatusAreaWidget;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class TooltipController;
 class TouchObserverHUD;
 class VisibilityController;
 class WindowModalityController;
 class WorkspaceController;
@@ skipping 72 matching lines @@
 
   void set_active_root_window(aura::RootWindow* active_root_window) {
     active_root_window_ = active_root_window;
   }
 
   // Adds or removes |filter| from the aura::Env's pre-target event-handler
   // list.
   void AddEnvEventFilter(aura::EventFilter* filter);
   void RemoveEnvEventFilter(aura::EventFilter* filter);
 
-  // Shows the background menu over |widget|.
-  void ShowBackgroundMenu(views::Widget* widget, const gfx::Point& location);
+  // Shows the context menu for the background and launcher at |location|.

[sky, 2012/10/10 04:07:17]

Document what location is relative to.

+  void ShowContextMenu(const gfx::Point& location);
 
   // Toggles app list.
   void ToggleAppList();
 
   // Returns app list target visibility.
   bool GetAppListTargetVisibility() const;
 
   // Returns app list window or NULL if it is not visible.
   aura::Window* GetAppListWindow();
 
@@ skipping 222 matching lines @@
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
-  scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
@@ skipping 57 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_