Fixed "Open in a Tab" option for apps in Chrome App Launcher.

chrome/browser/ui/app_list/app_context_menu.cc

 // Copyright 2013 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/app_list/app_context_menu.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/menu_manager.h"
@@ skipping 163 matching lines @@
   }
 
   return menu_model_.get();
 }
 
 bool AppContextMenu::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == TOGGLE_PIN || command_id == LAUNCH_NEW;
 }
 
 base::string16 AppContextMenu::GetLabelForCommandId(int command_id) const {
+  // If streamlined hosted apps are enabled, then we do not need to consider
+  // the case when command_id == TOGGLE_PIN (see AppContextMenu::GetMenuModel).
+  if (extensions::util::IsStreamlinedHostedAppsEnabled()) {
+    DCHECK_EQ(LAUNCH_NEW, command_id);
+    return IsCommandIdChecked(USE_LAUNCH_TYPE_REGULAR) ?
+        l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_TAB) :
+        l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_NEW_WINDOW);
+  }
+
   if (command_id == TOGGLE_PIN) {
     return controller_->IsAppPinned(app_id_) ?
         l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_UNPIN) :
         l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_PIN);
   } else if (command_id == LAUNCH_NEW) {
 #if defined(OS_MACOSX)
     // Even fullscreen windows launch in a browser tab on Mac.
     const bool launches_in_tab = true;
 #else
     const bool launches_in_tab = IsCommandIdChecked(USE_LAUNCH_TYPE_PINNED) ||
@@ skipping 84 matching lines @@
     extension_menu_items_->ExecuteCommand(command_id, NULL,
                                           content::ContextMenuParams());
   } else if (command_id == MENU_NEW_WINDOW) {
     controller_->CreateNewWindow(profile_, false);
   } else if (command_id == MENU_NEW_INCOGNITO_WINDOW) {
     controller_->CreateNewWindow(profile_, true);
   }
 }
 
 }  // namespace app_list