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

Unified Diff: ash/common/test/test_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/test/test_shelf_item_delegate.h ('k') | ash/public/cpp/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_shelf_item_delegate.cc
diff --git a/ash/common/test/test_shelf_item_delegate.cc b/ash/common/test/test_shelf_item_delegate.cc
index e086259bdaff750ced8f7ee719d9e8098cb831a9..e257d6e2aad55e25adb5dd9cdf77c3b0e958da77 100644
--- a/ash/common/test/test_shelf_item_delegate.cc
+++ b/ash/common/test/test_shelf_item_delegate.cc
@@ -26,9 +26,9 @@ ShelfItemDelegate::PerformedAction TestShelfItemDelegate::ItemSelected(
return kNoAction;
}
-ui::SimpleMenuModel* TestShelfItemDelegate::CreateApplicationMenu(
- int event_flags) {
- return nullptr;
+ShelfAppMenuItemList TestShelfItemDelegate::GetAppMenuItems(int event_flags) {
+ // Return an empty item list to avoid showing an application menu.
+ return ShelfAppMenuItemList();
}
void TestShelfItemDelegate::Close() {}
« no previous file with comments | « ash/common/test/test_shelf_item_delegate.h ('k') | ash/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698