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 14 matching lines...) Expand all Loading... | |
25 // Create an AppListShelfItemDelegate for that item. | 25 // Create an AppListShelfItemDelegate for that item. |
26 ShelfID id = model->items()[index].id; | 26 ShelfID id = model->items()[index].id; |
27 DCHECK_GE(id, 0); | 27 DCHECK_GE(id, 0); |
28 model->SetShelfItemDelegate(id, base::MakeUnique<AppListShelfItemDelegate>()); | 28 model->SetShelfItemDelegate(id, base::MakeUnique<AppListShelfItemDelegate>()); |
29 } | 29 } |
30 | 30 |
31 AppListShelfItemDelegate::AppListShelfItemDelegate() {} | 31 AppListShelfItemDelegate::AppListShelfItemDelegate() {} |
32 | 32 |
33 AppListShelfItemDelegate::~AppListShelfItemDelegate() {} | 33 AppListShelfItemDelegate::~AppListShelfItemDelegate() {} |
34 | 34 |
35 ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected( | 35 ShelfAction AppListShelfItemDelegate::ItemSelected(ui::EventType event_type, |
36 const ui::Event& event) { | 36 int event_flags, |
37 int64_t display_id, | |
38 ShelfLaunchSource source) { | |
37 WmShell::Get()->ToggleAppList(); | 39 WmShell::Get()->ToggleAppList(); |
38 return ShelfItemDelegate::kAppListMenuShown; | 40 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.
| |
39 } | 41 } |
40 | 42 |
41 ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems( | 43 ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems( |
42 int event_flags) { | 44 int event_flags) { |
43 // AppList does not show an application menu. | 45 // AppList does not show an application menu. |
44 return ShelfAppMenuItemList(); | 46 return ShelfAppMenuItemList(); |
45 } | 47 } |
46 | 48 |
47 void AppListShelfItemDelegate::Close() {} | 49 void AppListShelfItemDelegate::Close() {} |
48 | 50 |
49 } // namespace ash | 51 } // namespace ash |
OLD | NEW |