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

Unified Diff: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)
Patch Set: Address 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/app_window_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
index 631e530a956c586a13f9f3e7f2febe717d68d11e..36ac6a8b3c0ad0a26ba22916d295ca82935a5f71 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc
@@ -96,9 +96,16 @@ ash::ShelfAction AppWindowLauncherItemController::ItemSelected(
ash::ShelfAppMenuItemList AppWindowLauncherItemController::GetAppMenuItems(
int event_flags) {
+ // Return an empty item list to avoid showing an application menu.
return ash::ShelfAppMenuItemList();
}
+void AppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,
+ int event_flags) {
+ // This delegate does not support showing an application menu.
+ NOTIMPLEMENTED();
+}
+
void AppWindowLauncherItemController::Close() {
// Note: Closing windows may affect the contents of app_windows_.
WindowList windows_to_close = windows_;

Powered by Google App Engine
This is Rietveld 408576698