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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/test/test_shelf_item_delegate.cc

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)
Patch Set: Fix tests; cleanup. 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
« ash/common/test/test_shelf_item_delegate.h ('K') | « ash/common/test/test_shelf_item_delegate.h ('k') | ash/public/cpp/BUILD.gn » ('j') | ash/public/cpp/shelf_application_menu_item.h » ('J')
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..7d3c9c38683abd44b9751d78419cf8c8bf99ea08 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(
+ash::ShelfApplicationMenuItems TestShelfItemDelegate::GetAppMenuItems(
int event_flags) {
- return nullptr;
+ return ash::ShelfApplicationMenuItems();
James Cook 2017/02/06 17:30:21 ditto?
msw 2017/02/07 09:12:01 ditto (removed ash:: specifier)
}
void TestShelfItemDelegate::Close() {}
« ash/common/test/test_shelf_item_delegate.h ('K') | « ash/common/test/test_shelf_item_delegate.h ('k') | ash/public/cpp/BUILD.gn » ('j') | ash/public/cpp/shelf_application_menu_item.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698