mash: Cleanup ash shelf application menu code.

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/base_window.h"
 #include "ui/wm/core/window_animations.h"
 
 AppWindowLauncherItemController::AppWindowLauncherItemController(
     const std::string& app_id,
     const std::string& launch_id,
     ChromeLauncherController* controller)
@@ skipping 54 matching lines @@
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::Activate(ash::LaunchSource source) {
   DCHECK(!windows_.empty());
   ui::BaseWindow* window_to_activate =
       last_active_window_ ? last_active_window_ : windows_.back();
   window_to_activate->Activate();
   return kExistingWindowActivated;
 }
 
-ui::SimpleMenuModel* AppWindowLauncherItemController::CreateApplicationMenu(
-    int event_flags) {
-  return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
-}
-
-void AppWindowLauncherItemController::Close() {
-  // Note: Closing windows may affect the contents of app_windows_.
-  WindowList windows_to_close = windows_;
-  for (auto* window : windows_)
-    window->Close();
-}
-
-void AppWindowLauncherItemController::ActivateIndexedApp(size_t index) {
-  if (index >= windows_.size())
-    return;
-  auto it = windows_.begin();
-  std::advance(it, index);
-  ShowAndActivateOrMinimize(*it);
-}
-
-ChromeLauncherAppMenuItems AppWindowLauncherItemController::GetApplicationList(
-    int event_flags) {
-  ChromeLauncherAppMenuItems items;
-  // Add the application name to the menu.
-  base::string16 app_title = LauncherControllerHelper::GetAppTitle(
-      launcher_controller()->profile(), app_id());
-  items.push_back(
-      base::MakeUnique<ChromeLauncherAppMenuItem>(app_title, nullptr, false));
-  return items;
-}
-
 AppWindowLauncherItemController*
 AppWindowLauncherItemController::AsAppWindowLauncherItemController() {
   return this;
 }
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {
   if (windows_.empty())
     return kNoAction;
 
   ui::BaseWindow* window_to_show =
       last_active_window_ ? last_active_window_ : windows_.front();
   // If the event was triggered by a keystroke, we try to advance to the next
   // item if the window we are trying to activate is already active.
   if (windows_.size() >= 1 && window_to_show->IsActive() &&
       event.type() == ui::ET_KEY_RELEASED) {
     return ActivateOrAdvanceToNextAppWindow(window_to_show);
-  } else {
-    return ShowAndActivateOrMinimize(window_to_show);
   }
+
+  return ShowAndActivateOrMinimize(window_to_show);
+}
+
+ash::ShelfApplicationMenuItems AppWindowLauncherItemController::GetAppMenuItems(
+    int event_flags) {
+  return ash::ShelfApplicationMenuItems();
+}
+
+void AppWindowLauncherItemController::Close() {
+  // Note: Closing windows may affect the contents of app_windows_.
+  WindowList windows_to_close = windows_;

[James Cook, 2017/02/06 17:30:21]

optional thinking out loud: ShelfAppMenuItemList() is shorter than
ShelfApplicationMenuItems() and has the string List() in it, like WindowList.

[msw, 2017/02/07 09:12:01]

Done; I could also rename Application to App for all related identifiers if you
think that's an improvement, but I'm expecting this to churn again soon (using a
generalized shelf.mojom ContextMenuItem, as I noted).

+  for (auto* window : windows_)
+    window->Close();
+}
+
+void AppWindowLauncherItemController::ActivateIndexedApp(size_t index) {
+  if (index >= windows_.size())
+    return;
+  auto it = windows_.begin();
+  std::advance(it, index);
+  ShowAndActivateOrMinimize(*it);
 }

[James Cook, 2017/02/06 17:30:21]

btw, thanks for sorting the functions

[msw, 2017/02/07 09:12:01]

Acknowledged.

 
 void AppWindowLauncherItemController::OnWindowPropertyChanged(
     aura::Window* window,
     const void* key,
     intptr_t old) {
   if (key == aura::client::kDrawAttentionKey) {
     ash::ShelfItemStatus status;
     if (ash::wm::IsActiveWindow(window)) {
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
     } else {
       status = ash::STATUS_RUNNING;
     }
     launcher_controller()->SetItemStatus(shelf_id(), status);
   }
 }
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::ShowAndActivateOrMinimize(
     ui::BaseWindow* app_window) {
   // Either show or minimize windows when shown from the launcher.
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
-      app_window, GetApplicationList(0).size() == 2);
+      app_window, GetAppMenuItems(0).size() == 1);
 }
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::ActivateOrAdvanceToNextAppWindow(
     ui::BaseWindow* window_to_show) {
   WindowList::iterator i(
       std::find(windows_.begin(), windows_.end(), window_to_show));
   if (i != windows_.end()) {
     if (++i != windows_.end())
       window_to_show = *i;
     else
       window_to_show = windows_.front();
   }
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return kNoAction;
 }