ash/wm/workspace_controller.cc - Issue 9960024: Remove "set wallpaper..." option in system context menu when guest logged in

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/workspace_controller.cc

Issue 9960024: Remove "set wallpaper..." option in system context menu when guest logged in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ash/wm/workspace_controller.cc

diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc

index 355e5e56504971314ca61a84a20adb906e057a91..627db5080f2fa67940ff1f3904aaeb102faf4b7e 100644

--- a/ash/wm/workspace_controller.cc

+++ b/ash/wm/workspace_controller.cc

@@ -64,8 +64,10 @@ void WorkspaceController::ShowMenu(views::Widget* widget,

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 th

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(

« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/chromeos/background/desktop_background_observer.cc » ('j') | no next file with comments »