chrome/browser/ui/ash/launcher/shell_window_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/shell_window_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/launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/shell_window_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/shell_window_launcher_item_controller.h

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

index 6cb8f8824d361ccbae5d1263cf82f4bcf23c7bdf..b3bdf04e7fa19b2dc69eaff524a3d5f8dc75f415 100644

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

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

@@ -31,7 +31,7 @@ class ChromeLauncherController;

// instance per app, per launcher id.

// For apps with multiple windows, each item controller keeps track of all

// windows associated with the app and their activation order.

-// Instances are owned by ash::LauncherItemDelegateManager.

+// Instances are owned by ash::ShelfItemDelegateManager.

// Tests are in chrome_launcher_controller_browsertest.cc

@@ -64,10 +64,8 @@ class ShellWindowLauncherItemController : public LauncherItemController,

int event_flags) OVERRIDE;

virtual bool ItemSelected(const ui::Event& eent) OVERRIDE;

virtual base::string16 GetTitle() OVERRIDE;

- virtual ui::MenuModel* CreateContextMenu(

- aura::Window* root_window) OVERRIDE;

- virtual ash::LauncherMenuModel* CreateApplicationMenu(

- int event_flags) OVERRIDE;

+ virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;

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

virtual bool IsDraggable() OVERRIDE;

virtual bool ShouldShowTooltip() OVERRIDE;