chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

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: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments Created 4 years, 4 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

« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc

index 4840ba854497b917fa427cc06c0ab87ba0deb83e..474802b3fbd0234861f120605c480bb3e9dd6564 100644

--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc

+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc

@@ -10,9 +10,8 @@

#include "ash/common/shelf/shelf_model.h"

#include "ash/common/shelf/shelf_widget.h"

#include "ash/common/shelf/wm_shelf.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

#include "ash/common/wm_shell.h"

-#include "ash/desktop_background/user_wallpaper_delegate.h"

-#include "ash/shell.h"

#include "build/build_config.h"

#include "chrome/browser/fullscreen.h"

#include "chrome/browser/profiles/profile.h"

@@ -98,8 +97,8 @@ bool LauncherContextMenu::IsCommandIdEnabled(int command_id) const {

case MENU_PIN:

return controller_->IsPinnable(item_.id);

case MENU_CHANGE_WALLPAPER:

- return ash::Shell::GetInstance()

- ->user_wallpaper_delegate()

+ return ash::WmShell::Get()

+ ->wallpaper_delegate()

->CanOpenSetWallpaperPage();

case MENU_AUTO_HIDE:

return CanUserModifyShelfAutoHideBehavior(controller_->GetProfile());

@@ -140,8 +139,7 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {

case MENU_ALIGNMENT_MENU:

break;

case MENU_CHANGE_WALLPAPER:

- ash::Shell::GetInstance()->user_wallpaper_delegate()->

- OpenSetWallpaperPage();

+ ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();

break;

default:

NOTREACHED();