| 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 425ffecc3a81bf8b27199b4d5bdd9477189c5024..bc9b724f56e3494511f10c28b5184561c5a3bf9b 100644
|
| --- a/ash/common/shelf/app_list_shelf_item_delegate.cc
|
| +++ b/ash/common/shelf/app_list_shelf_item_delegate.cc
|
| @@ -32,22 +32,17 @@ AppListShelfItemDelegate::AppListShelfItemDelegate() {}
|
|
|
| AppListShelfItemDelegate::~AppListShelfItemDelegate() {}
|
|
|
| -ShelfAction AppListShelfItemDelegate::ItemSelected(ui::EventType event_type,
|
| - int event_flags,
|
| - int64_t display_id,
|
| - ShelfLaunchSource source) {
|
| +void AppListShelfItemDelegate::ItemSelected(
|
| + std::unique_ptr<ui::Event> event,
|
| + int64_t display_id,
|
| + ShelfLaunchSource source,
|
| + const ItemSelectedCallback& callback) {
|
| WmShell::Get()->ToggleAppList();
|
| - return SHELF_ACTION_APP_LIST_SHOWN;
|
| -}
|
| -
|
| -ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems(
|
| - int event_flags) {
|
| - // Return an empty item list to avoid showing an application menu.
|
| - return ShelfAppMenuItemList();
|
| + callback.Run(SHELF_ACTION_APP_LIST_SHOWN, base::nullopt);
|
| }
|
|
|
| void AppListShelfItemDelegate::ExecuteCommand(uint32_t command_id,
|
| - int event_flags) {
|
| + int32_t event_flags) {
|
| // This delegate does not support showing an application menu.
|
| NOTIMPLEMENTED();
|
| }
|
|
|