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

Unified Diff: ash/shell/window_watcher_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/shell/window_watcher_shelf_item_delegate.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/window_watcher_shelf_item_delegate.cc
diff --git a/ash/shell/window_watcher_shelf_item_delegate.cc b/ash/shell/window_watcher_shelf_item_delegate.cc
index cfceb3c32b56b46eb32805162112861120812e86..935186d56a7dd45ab0da9557192eca83384b2f54 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.cc
+++ b/ash/shell/window_watcher_shelf_item_delegate.cc
@@ -31,9 +31,10 @@ ShelfItemDelegate::PerformedAction WindowWatcherShelfItemDelegate::ItemSelected(
return kExistingWindowActivated;
}
-ui::SimpleMenuModel* WindowWatcherShelfItemDelegate::CreateApplicationMenu(
+ShelfAppMenuItemList WindowWatcherShelfItemDelegate::GetAppMenuItems(
int event_flags) {
- return nullptr;
+ // Return an empty item list to avoid showing an application menu.
+ return ShelfAppMenuItemList();
}
void WindowWatcherShelfItemDelegate::Close() {}
« no previous file with comments | « ash/shell/window_watcher_shelf_item_delegate.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698