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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.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
Index: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
index ff8294809dbbfcc482c1fc06d4dd259db1bbc6a8..f16a57bae34c9fbc2f0ee5dd15d80639c2b912fd 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc
@@ -37,9 +37,9 @@ ArcAppDeferredLauncherItemController::ItemSelected(const ui::Event& event) {
return ash::ShelfItemDelegate::kNoAction;
}
-ui::SimpleMenuModel*
-ArcAppDeferredLauncherItemController::CreateApplicationMenu(int event_flags) {
- return nullptr;
+ash::ShelfAppMenuItemList ArcAppDeferredLauncherItemController::GetAppMenuItems(
+ int event_flags) {
+ return ash::ShelfAppMenuItemList();
}
void ArcAppDeferredLauncherItemController::Close() {
@@ -54,8 +54,3 @@ ash::ShelfItemDelegate::PerformedAction
ArcAppDeferredLauncherItemController::Activate(ash::LaunchSource source) {
return ash::ShelfItemDelegate::kNoAction;
}
-
-ChromeLauncherAppMenuItems
-ArcAppDeferredLauncherItemController::GetApplicationList(int event_flags) {
- return ChromeLauncherAppMenuItems();
-}

Powered by Google App Engine
This is Rietveld 408576698