Chromium Code Reviews| Index: ash/shelf/app_list_shelf_item_delegate.cc |
| diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc |
| index 466759dc024d3bb1a82b384ddde7a6f4a37db7de..76361cd9b818719e30a322b72ebc3eedbabb2e9d 100644 |
| --- a/ash/shelf/app_list_shelf_item_delegate.cc |
| +++ b/ash/shelf/app_list_shelf_item_delegate.cc |
| @@ -4,6 +4,8 @@ |
| #include "ash/shelf/app_list_shelf_item_delegate.h" |
| +#include <utility> |
| + |
| #include "ash/shelf/shelf_model.h" |
| #include "ash/shell.h" |
| #include "ash/strings/grit/ash_strings.h" |
| @@ -41,13 +43,12 @@ AppListShelfItemDelegate::AppListShelfItemDelegate() |
| AppListShelfItemDelegate::~AppListShelfItemDelegate() {} |
| -void AppListShelfItemDelegate::ItemSelected( |
| - std::unique_ptr<ui::Event> event, |
| - int64_t display_id, |
| - ShelfLaunchSource source, |
| - const ItemSelectedCallback& callback) { |
| +void AppListShelfItemDelegate::ItemSelected(std::unique_ptr<ui::Event> event, |
| + int64_t display_id, |
| + ShelfLaunchSource source, |
| + ItemSelectedCallback callback) { |
| Shell::Get()->ToggleAppList(); |
| - callback.Run(SHELF_ACTION_APP_LIST_SHOWN, base::nullopt); |
| + std::move(callback).Run(SHELF_ACTION_APP_LIST_SHOWN, base::nullopt); |
|
James Cook
2017/05/09 18:30:40
Aside: I know this decision has already been made,
tzik
2017/05/11 08:15:20
Yes, it's very helpful. Kudos goes to dcheng.
|
| } |
| void AppListShelfItemDelegate::ExecuteCommand(uint32_t command_id, |