chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - 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/chrome_launcher_controller.h

Issue 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: explicitly destroy ShelfItemDelegates 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

index 108d4f8cf1ffec1606e93edd6bf47079f5dd7244..eb963f98e6f58bf2d05aea17197adeeb1feef1aa 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

@@ -78,8 +78,7 @@ class ChromeLauncherController {

virtual void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) = 0;

// Updates the controller associated with id (which should be a shortcut).

- // |controller| will be owned by the |ChromeLauncherController| and then

- // passed on to |ShelfItemDelegateManager|.

+ // Takes ownership of |controller|.

// TODO(skuhne): Pass in scoped_ptr to make ownership clear.

virtual void SetItemController(ash::ShelfID id,

LauncherItemController* controller) = 0;