Combine shelf platform and windowed app types.

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

 // Copyright 2016 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/extension_launcher_context_menu.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
@@ skipping 23 matching lines @@
     : LauncherContextMenu(controller, item, wm_shelf) {
   Init();
 }
 
 ExtensionLauncherContextMenu::~ExtensionLauncherContextMenu() {}
 
 void ExtensionLauncherContextMenu::Init() {
   extension_items_.reset(new extensions::ContextMenuMatcher(
       controller()->profile(), this, this,
       base::Bind(MenuItemHasLauncherContext)));
-  if (item().type == ash::TYPE_APP_SHORTCUT ||
-      item().type == ash::TYPE_WINDOWED_APP) {
+  if (item().type == ash::TYPE_APP_SHORTCUT || item().type == ash::TYPE_APP) {
     // V1 apps can be started from the menu - but V2 apps should not.
     if (!controller()->IsPlatformApp(item().id)) {
       AddItem(MENU_OPEN_NEW, base::string16());
       AddSeparator(ui::NORMAL_SEPARATOR);
     }
+
     AddPinMenu();
-    if (controller()->IsOpen(item().id))
+
+    if (controller()->IsOpen(item().id) &&
+        !extension_misc::IsImeMenuExtensionId(
+            controller()->GetAppIDForShelfID(item().id))) {
       AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
+    }
 
     if (!controller()->IsPlatformApp(item().id) &&
-        item().type != ash::TYPE_WINDOWED_APP) {
+        item().type == ash::TYPE_APP_SHORTCUT) {
       AddSeparator(ui::NORMAL_SEPARATOR);
       if (extensions::util::IsNewBookmarkAppsEnabled()) {
         // With bookmark apps enabled, hosted apps launch in a window by
         // default. This menu item is re-interpreted as a single, toggle-able
         // option to launch the hosted app as a tab.
         AddCheckItemWithStringId(LAUNCH_TYPE_WINDOW,
                                  IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
       } else {
         AddCheckItemWithStringId(LAUNCH_TYPE_REGULAR_TAB,
                                  IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
@@ skipping 15 matching lines @@
     }
     if (!BrowserShortcutLauncherItemController(
              controller(), ash::WmShell::Get()->shelf_model())
              .IsListOfActiveBrowserEmpty()) {
       AddItem(MENU_CLOSE,
               l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
     }
   } else if (item().type == ash::TYPE_DIALOG) {
     AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   } else {
-    if (item().type == ash::TYPE_PLATFORM_APP)
-      AddPinMenu();
-    bool show_close_button = controller()->IsOpen(item().id);
-    if (extension_misc::IsImeMenuExtensionId(
+    if (controller()->IsOpen(item().id) &&
+        !extension_misc::IsImeMenuExtensionId(

[Mr4D (OOO till 08-26), 2016/11/23 23:11:51]

You have effectively removed the pinning option - unless I am missing something?

[msw, 2016/11/24 00:00:55]

Pinning was only added here for TYPE_PLATFORM_APP, which is now handled above
for TYPE_APP. This else block no longer handles the app type.

[Mr4D (OOO till 08-26), 2016/11/24 02:21:33]

Ok. Thanks!

             controller()->GetAppIDForShelfID(item().id))) {
-      show_close_button = false;
+      AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
     }
-
-    if (show_close_button)
-      AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   }
   AddSeparator(ui::NORMAL_SEPARATOR);
-  if (item().type == ash::TYPE_APP_SHORTCUT ||
-      item().type == ash::TYPE_WINDOWED_APP ||
-      item().type == ash::TYPE_PLATFORM_APP) {
+  if (item().type == ash::TYPE_APP_SHORTCUT || item().type == ash::TYPE_APP) {
     const extensions::MenuItem::ExtensionKey app_key(
         controller()->GetAppIDForShelfID(item().id));
     if (!app_key.empty()) {
       int index = 0;
       extension_items_->AppendExtensionItems(app_key, base::string16(), &index,
                                              false);  // is_action_menu
       AddSeparator(ui::NORMAL_SEPARATOR);
     }
   }
   AddShelfOptionsMenu();
 }
 
 bool ExtensionLauncherContextMenu::IsItemForCommandIdDynamic(
     int command_id) const {
   return command_id == MENU_OPEN_NEW;
 }
 
 base::string16 ExtensionLauncherContextMenu::GetLabelForCommandId(
     int command_id) const {
   if (command_id == MENU_OPEN_NEW) {
-    if (item().type == ash::TYPE_PLATFORM_APP)
+    if (controller()->IsPlatformApp(item().id))
       return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW);
     switch (controller()->GetLaunchType(item().id)) {
       case extensions::LAUNCH_TYPE_PINNED:
       case extensions::LAUNCH_TYPE_REGULAR:
         return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_TAB);
       case extensions::LAUNCH_TYPE_FULLSCREEN:
       case extensions::LAUNCH_TYPE_WINDOW:
         return l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW);
       default:
         NOTREACHED();
@@ skipping 80 matching lines @@
     case MENU_NEW_INCOGNITO_WINDOW:
       chrome::NewEmptyWindow(controller()->profile()->GetOffTheRecordProfile());
       break;
     default:
       if (extension_items_) {
         extension_items_->ExecuteCommand(command_id, nullptr, nullptr,
                                          content::ContextMenuParams());
       }
   }
 }