| 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..68bb41bff5878842152685f3d14584bde986be12 100644
|
| --- a/ash/shelf/app_list_shelf_item_delegate.h
|
| +++ b/ash/shelf/app_list_shelf_item_delegate.h
|
| @@ -5,25 +5,24 @@
|
| #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 ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
|
| virtual LauncherMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
|
| virtual bool IsDraggable() OVERRIDE;
|
| virtual bool ShouldShowTooltip() OVERRIDE;
|
|
|