Remove "set wallpaper..." option in system context menu when guest logged in

ash/wm/workspace_controller.cc

 // 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.
 
 #include "ash/wm/workspace_controller.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
@@ skipping 40 matching lines @@
   if (viewport_->layout_manager() == layout_manager_)
     viewport_->SetLayoutManager(NULL);
 }
 
 void WorkspaceController::ToggleOverview() {
   workspace_manager_->SetOverview(!workspace_manager_->is_overview());
 }
 
 void WorkspaceController::ShowMenu(views::Widget* widget,
                                    const gfx::Point& location) {
   // TODO(sky): move this. Since this menu is now specific to the background it

[sky, 2012/04/05 03:48:14]

Since this is targeted at m20, can you clean this up and remove the context menu
from workspacecontroller.

[bshe, 2012/04/05 15:42:31]

Just to clarify, do you want to remove this in workspace completely? Do we have
plan to add menu for workspace in the future? I plan to move it into desktop
background controller. Do you have any other suggestion? Thanks!

On 2012/04/05 03:48:14, sky wrote:

[bshe, 2012/04/10 18:27:42]

Done.

   // doesn't make sense to be here.
 #if !defined(OS_MACOSX)
   ui::SimpleMenuModel menu_model(this);
   // This is just for testing and will be ripped out before we ship, so none of
   // the strings are localized.
-  menu_model.AddItem(MENU_CHANGE_WALLPAPER,
-                     l10n_util::GetStringUTF16(IDS_AURA_SET_DESKTOP_WALLPAPER));
+  if (!Shell::GetInstance()->user_wallpaper_delegate()->IsLoggedInAsGuest()) {

[sky, 2012/04/05 03:48:14]

If this is false, you'll show an empty menu. In this case don't do anything.

[bshe, 2012/04/10 18:27:42]

Done.

+    menu_model.AddItem(MENU_CHANGE_WALLPAPER,
+        l10n_util::GetStringUTF16(IDS_AURA_SET_DESKTOP_WALLPAPER));
+  }
   views::MenuModelAdapter menu_model_adapter(&menu_model);
   menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
   if (menu_runner_->RunMenuAt(
           widget, NULL, gfx::Rect(location, gfx::Size()),
           views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
 #endif  // !defined(OS_MACOSX)
 }
 
@@ skipping 28 matching lines @@
 }
 
 bool WorkspaceController::GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) {
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash