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

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/launcher/browser_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0ce184591a6ea93ee9a0037e1dfa62fffa4149b9..9626d48edd33880a1c437728506cb81c53adfddc 100644

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

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

@@ -207,8 +207,8 @@ base::string16 AppShortcutLauncherItemController::GetTitle() {

ui::MenuModel* AppShortcutLauncherItemController::CreateContextMenu(

aura::Window* root_window) {

- ash::LauncherItem item =

- *(launcher_controller()->model()->ItemByID(launcher_id()));

+ ash::ShelfItem item =

+ *(launcher_controller()->model()->ItemByID(shelf_id()));

return new LauncherContextMenu(launcher_controller(), &item, root_window);

}