chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h - Issue 97173003: ash: Rename more Launcher classes to Shelf*.

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/browser_shortcut_launcher_item_controller.h

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: link chrome Created 7 years 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_shortcut_launcher_item_controller.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/browser_shortcut_launcher_item_controller.h

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

index 0894cde738ee28f8cea971eceea73ac9fe629d3d..222bd5ed7bd319dc246ed081db4758f7035e180c 100644

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

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

@@ -41,8 +41,7 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {

virtual base::string16 GetTitle() OVERRIDE;

virtual ui::MenuModel* CreateContextMenu(

aura::Window* root_window) OVERRIDE;

- virtual ash::LauncherMenuModel* CreateApplicationMenu(

- int event_flags) OVERRIDE;

+ virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;

virtual bool IsDraggable() OVERRIDE;

virtual bool ShouldShowTooltip() OVERRIDE;