| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 5 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_model.h" | 7 #include "ash/common/shelf/shelf_model.h" |
| 8 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "grit/ash_strings.h" | 10 #include "grit/ash_strings.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 AppListShelfItemDelegate::AppListShelfItemDelegate() {} | 31 AppListShelfItemDelegate::AppListShelfItemDelegate() {} |
| 32 | 32 |
| 33 AppListShelfItemDelegate::~AppListShelfItemDelegate() {} | 33 AppListShelfItemDelegate::~AppListShelfItemDelegate() {} |
| 34 | 34 |
| 35 ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected( | 35 ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected( |
| 36 const ui::Event& event) { | 36 const ui::Event& event) { |
| 37 WmShell::Get()->ToggleAppList(); | 37 WmShell::Get()->ToggleAppList(); |
| 38 return ShelfItemDelegate::kAppListMenuShown; | 38 return ShelfItemDelegate::kAppListMenuShown; |
| 39 } | 39 } |
| 40 | 40 |
| 41 ui::SimpleMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( | 41 ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems( |
| 42 int event_flags) { | 42 int event_flags) { |
| 43 // AppList does not show an application menu. | 43 // AppList does not show an application menu. |
| 44 return nullptr; | 44 return ShelfAppMenuItemList(); |
| 45 } | 45 } |
| 46 | 46 |
| 47 void AppListShelfItemDelegate::Close() {} | 47 void AppListShelfItemDelegate::Close() {} |
| 48 | 48 |
| 49 } // namespace ash | 49 } // namespace ash |
| OLD | NEW |