ash/shelf/shelf_window_watcher.cc - Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu

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/shelf/shelf_window_watcher.cc

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 11 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:

Index: ash/shelf/shelf_window_watcher.cc

diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc

index 9766f54b5d5a3615e1ad0b2a3cea89e1c7a24adf..18a44089466077fa7e1447760367436c4ba4a7db 100644

--- a/ash/shelf/shelf_window_watcher.cc

+++ b/ash/shelf/shelf_window_watcher.cc

@@ -91,7 +91,7 @@ void ShelfWindowWatcher::AddLauncherItem(aura::Window* window) {

SetShelfItemDetailsForLauncherItem(&item, *item_details);

SetLauncherIDForWindow(id, window);

scoped_ptr<ShelfItemDelegate> item_delegate(

- new ShelfWindowWatcherItemDelegate(window));

+ new ShelfWindowWatcherItemDelegate(window, model_));

// |item_delegate| is owned by |item_delegate_manager_|.

item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass());

model_->Add(item);