Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in …

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

 // Copyright (c) 2012 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/launcher_context_menu.h"
 
 #include <string>
 
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/root_window_controller.h"
@@ skipping 49 matching lines @@
   Init();
 }
 
 void LauncherContextMenu::Init() {
   extension_items_.reset(new extensions::ContextMenuMatcher(
       controller_->profile(), this, this,
       base::Bind(MenuItemHasLauncherContext)));
   set_delegate(this);
 
   if (is_valid_item()) {
-    if (item_.type == ash::TYPE_APP_SHORTCUT) {
-      DCHECK(controller_->IsPinned(item_.id));
+    if (item_.type == ash::TYPE_APP_SHORTCUT ||
+        item_.type == ash::TYPE_WINDOWED_APP) {
+      DCHECK(item_.type == ash::TYPE_APP_SHORTCUT &&
+             controller_->IsPinned(item_.id));
       // V1 apps can be started from the menu - but V2 apps should not.
       if  (!controller_->IsPlatformApp(item_.id)) {
         AddItem(MENU_OPEN_NEW, string16());
         AddSeparator(ui::NORMAL_SEPARATOR);
       }
       AddItem(
           MENU_PIN,
-          l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_UNPIN));
+          l10n_util::GetStringUTF16(controller_->IsPinned(item_.id) ?
+                                    IDS_LAUNCHER_CONTEXT_MENU_UNPIN :
+                                    IDS_LAUNCHER_CONTEXT_MENU_PIN));
       if (controller_->IsOpen(item_.id)) {
         AddItem(MENU_CLOSE,
                 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
       }
       if (!controller_->IsPlatformApp(item_.id)) {
         AddSeparator(ui::NORMAL_SEPARATOR);
         AddCheckItemWithStringId(
             LAUNCH_TYPE_REGULAR_TAB,
             IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
         AddCheckItemWithStringId(
@@ skipping 21 matching lines @@
             MENU_PIN,
             l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_PIN));
       }
       if (controller_->IsOpen(item_.id)) {
         AddItem(MENU_CLOSE,
                 l10n_util::GetStringUTF16(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) {
       std::string app_id = controller_->GetAppIDForLauncherID(item_.id);
       if (!app_id.empty()) {
         int index = 0;
         extension_items_->AppendExtensionItems(
             app_id, string16(), &index);
         AddSeparator(ui::NORMAL_SEPARATOR);
       }
     }
   }
@@ skipping 133 matching lines @@
       break;
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
     default:
       extension_items_->ExecuteCommand(command_id, NULL,
                                        content::ContextMenuParams());
   }
 }