Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: ash/shelf/app_list_shelf_item_delegate.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 | « ash/launcher/launcher_unittest.cc ('k') | ash/shelf/app_list_shelf_item_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_shelf_item_delegate.h
diff --git a/ash/shelf/app_list_shelf_item_delegate.h b/ash/shelf/app_list_shelf_item_delegate.h
index 750a84bbb829e638b67c288f93e9d221bf10336e..0396821b65bf5af57750fdcc0279131b85e67610 100644
--- a/ash/shelf/app_list_shelf_item_delegate.h
+++ b/ash/shelf/app_list_shelf_item_delegate.h
@@ -5,26 +5,25 @@
#ifndef ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
#define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
-#include "ash/launcher/launcher_item_delegate.h"
+#include "ash/shelf/shelf_item_delegate.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
namespace ash {
namespace internal {
-// LauncherItemDelegate for TYPE_APP_LIST.
-class AppListShelfItemDelegate : public LauncherItemDelegate {
+// ShelfItemDelegate for TYPE_APP_LIST.
+class AppListShelfItemDelegate : public ShelfItemDelegate {
public:
AppListShelfItemDelegate();
virtual ~AppListShelfItemDelegate();
- // ash::LauncherItemDelegate overrides:
+ // ShelfItemDelegate:
virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
virtual base::string16 GetTitle() OVERRIDE;
- virtual ui::MenuModel* CreateContextMenu(
- aura::Window* root_window) OVERRIDE;
- virtual LauncherMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
+ virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
+ virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
virtual bool IsDraggable() OVERRIDE;
virtual bool ShouldShowTooltip() OVERRIDE;
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/shelf/app_list_shelf_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698