chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.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/launcher_application_menu_item_model.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/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h

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

index 1db85e5a732b52d725bf41269f3157af011c2d70..7465d9ab4c88593d9926353b23d99aca27517ea3 100644

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

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

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_APPLICATION_MENU_ITEM_MODEL_H_

#include "ash/launcher/launcher_delegate.h"

-#include "ash/launcher/launcher_item_delegate.h"

+#include "ash/shelf/shelf_menu_model.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

@@ -17,14 +17,14 @@ typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;

// A menu model that builds the contents of a menu for a launcher item

// containing a list of running applications.

-class LauncherApplicationMenuItemModel : public ash::LauncherMenuModel,

+class LauncherApplicationMenuItemModel : public ash::ShelfMenuModel,

public ui::SimpleMenuModel::Delegate {

public:

explicit LauncherApplicationMenuItemModel(

ChromeLauncherAppMenuItems item_list);

virtual ~LauncherApplicationMenuItemModel();

- // Overridden from ash::LauncherMenuModel:

+ // Overridden from ash::ShelfMenuModel:

virtual bool IsCommandActive(int command_id) const OVERRIDE;

// Overridden from ui::SimpleMenuModel::Delegate: