ash/shelf/shelf_window_watcher_item_delegate.cc - Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems...

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_item_delegate.cc

Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: OWNERS 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_item_delegate.cc

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

index 48d582b33945552a161d1398bfae44dd6b1f4361..fcae1afa018d74f9f209f4a3d4f23849a0fd6bcb 100644

--- a/ash/shelf/shelf_window_watcher_item_delegate.cc

+++ b/ash/shelf/shelf_window_watcher_item_delegate.cc

@@ -51,8 +51,7 @@ base::string16 ShelfWindowWatcherItemDelegate::GetTitle() {

ui::MenuModel* ShelfWindowWatcherItemDelegate::CreateContextMenu(

aura::Window* root_window) {

- ash::LauncherItem item =

- *(model_->ItemByID(GetLauncherIDForWindow(window_)));

+ ash::ShelfItem item = *(model_->ItemByID(GetShelfIDForWindow(window_)));

return Shell::GetInstance()->delegate()->CreateContextMenu(root_window,

this,

&item);

« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »