chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel

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 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanup Created 4 years, 5 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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc ('k') | no next file » | 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 388f3aa0b958d645c9b986c8d1c2da0873eb21ad..f7c0604ffab5c2802da184ecddc1da88ad2e833c 100644

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

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

@@ -7,6 +7,7 @@

#include <string>

#include "ash/common/session/session_state_delegate.h"

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

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

#include "ash/common/wm_shell.h"

#include "ash/desktop_background/user_wallpaper_delegate.h"

@@ -122,9 +123,7 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {

case MENU_CLOSE:

if (item_.type == ash::TYPE_DIALOG) {

ash::ShelfItemDelegate* item_delegate =

- ash::Shell::GetInstance()

- ->shelf_item_delegate_manager()

- ->GetShelfItemDelegate(item_.id);

+ ash::WmShell::Get()->shelf_model()->GetShelfItemDelegate(item_.id);

DCHECK(item_delegate);

item_delegate->Close();

} else {