Add Wallpaper option to launcher context menu

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3627616f794080c682bfccd2f5e06b325d2f8a1f..900dd711fdd304b20ce3d2ac176853d786a586c9 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -25,7 +25,6 @@
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
-#include "ash/shell_context_menu.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
@@ -383,7 +382,6 @@ void Shell::Init() {
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
 #endif
-  shell_context_menu_.reset(new internal::ShellContextMenu);
 
   // The order in which event filters are added is significant.
   user_activity_detector_.reset(new UserActivityDetector);
@@ -514,16 +512,14 @@ void Shell::RemoveEnvEventFilter(aura::EventFilter* filter) {
   aura::Env::GetInstance()->RemovePreTargetHandler(filter);
 }
 
-void Shell::ShowBackgroundMenu(views::Widget* widget,
-                               const gfx::Point& location) {
+void Shell::ShowContextMenu(const gfx::Point& location) {
   // No context menus if user have not logged in.
   if (!delegate_.get() || !delegate_->IsUserLoggedIn())
     return;
   // No context menus when screen is locked.
   if (IsScreenLocked())
     return;
-  if (shell_context_menu_.get())
-    shell_context_menu_->ShowMenu(widget, location);
+  launcher()->ShowContextMenu(location);

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

NULL check this sine it can be NULL.

 }
 
 void Shell::ToggleAppList() {