Index: ash/common/shelf/app_list_shelf_item_delegate.cc |
diff --git a/ash/common/shelf/app_list_shelf_item_delegate.cc b/ash/common/shelf/app_list_shelf_item_delegate.cc |
index 6e1f003797755bd91dccaa0ef21e81b2aadbb87b..1ceb2cece69eac861a0bd33d0935ab71000884b4 100644 |
--- a/ash/common/shelf/app_list_shelf_item_delegate.cc |
+++ b/ash/common/shelf/app_list_shelf_item_delegate.cc |
@@ -32,10 +32,12 @@ AppListShelfItemDelegate::AppListShelfItemDelegate() {} |
AppListShelfItemDelegate::~AppListShelfItemDelegate() {} |
-ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected( |
- const ui::Event& event) { |
+ShelfAction AppListShelfItemDelegate::ItemSelected(ui::EventType event_type, |
+ int event_flags, |
+ int64_t display_id, |
+ ShelfLaunchSource source) { |
WmShell::Get()->ToggleAppList(); |
- return ShelfItemDelegate::kAppListMenuShown; |
+ return ash::kAppListMenuShown; |
James Cook
2017/02/15 00:44:39
ash:: not needed?
Also, if you have to touch the
msw
2017/02/15 19:59:17
Done.
|
} |
ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems( |