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

Unified Diff: ash/common/shelf/shelf_window_watcher_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
Index: ash/common/shelf/shelf_window_watcher_item_delegate.cc
diff --git a/ash/common/shelf/shelf_window_watcher_item_delegate.cc b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
index dfee1468c1af931186b0a7edcdf7dce1409d3ee9..6626a9c42a8f811ea2ba65c88b066078f6655b34 100644
--- a/ash/common/shelf/shelf_window_watcher_item_delegate.cc
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
@@ -55,9 +55,9 @@ ShelfItemDelegate::PerformedAction ShelfWindowWatcherItemDelegate::ItemSelected(
return kExistingWindowActivated;
}
-ui::SimpleMenuModel* ShelfWindowWatcherItemDelegate::CreateApplicationMenu(
+ShelfApplicationMenuItems ShelfWindowWatcherItemDelegate::GetAppMenuItems(
int event_flags) {
- return nullptr;
+ return ShelfApplicationMenuItems();
}
void ShelfWindowWatcherItemDelegate::Close() {

Powered by Google App Engine
This is Rietveld 408576698