Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1540)

Unified Diff: ash/common/shelf/app_list_shelf_item_delegate.cc

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)
Patch Set: Add comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/app_list_shelf_item_delegate.h ('k') | ash/common/shelf/shelf_application_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 244d3e6128776f864fdfc8414640fc974df303f9..6e1f003797755bd91dccaa0ef21e81b2aadbb87b 100644
--- a/ash/common/shelf/app_list_shelf_item_delegate.cc
+++ b/ash/common/shelf/app_list_shelf_item_delegate.cc
@@ -38,10 +38,10 @@ ShelfItemDelegate::PerformedAction AppListShelfItemDelegate::ItemSelected(
return ShelfItemDelegate::kAppListMenuShown;
}
-ui::SimpleMenuModel* AppListShelfItemDelegate::CreateApplicationMenu(
+ShelfAppMenuItemList AppListShelfItemDelegate::GetAppMenuItems(
int event_flags) {
// AppList does not show an application menu.
- return nullptr;
+ return ShelfAppMenuItemList();
}
void AppListShelfItemDelegate::Close() {}
« no previous file with comments | « ash/common/shelf/app_list_shelf_item_delegate.h ('k') | ash/common/shelf/shelf_application_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698