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

chrome/browser/ui/ash/launcher/launcher_item_controller.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_item_controller.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/common/extensions/extension.h"
 
 LauncherItemController::LauncherItemController(
     Type type,
     const std::string& app_id,
     ChromeLauncherController* launcher_controller)
     : type_(type),
       app_id_(app_id),
       launcher_id_(0),
-      launcher_controller_(launcher_controller) {
+      launcher_controller_(launcher_controller),
+      locked_(0) {
 }
 
 LauncherItemController::~LauncherItemController() {
 }
 
+const std::string& LauncherItemController::app_id() const {
+  return app_id_;
+}
+
 string16 LauncherItemController::GetAppTitle() const {
   if (app_id_.empty())
     return string16();
   const extensions::Extension* extension =
       launcher_controller_->profile()->GetExtensionService()->
       GetInstalledExtension(app_id_);
   return extension ? UTF8ToUTF16(extension->name()) : string16();
 }
 
 ash::LauncherItemType LauncherItemController::GetLauncherItemType() const {
   switch (type_) {
     case LauncherItemController::TYPE_SHORTCUT:
+    case LauncherItemController::TYPE_WINDOWED_APP:
       return ash::TYPE_APP_SHORTCUT;
     case LauncherItemController::TYPE_APP:
     case LauncherItemController::TYPE_EXTENSION_PANEL:
       return ash::TYPE_PLATFORM_APP;
     case LauncherItemController::TYPE_APP_PANEL:
       return ash::TYPE_APP_PANEL;
     case LauncherItemController::TYPE_TABBED:
       return ash::TYPE_TABBED;
   }
   NOTREACHED();
   return ash::TYPE_APP_SHORTCUT;
 }