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

Index: chrome/browser/ui/ash/launcher/launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
index 2c2dea77341b2ac582c3f87c81cd7ae61433fc97..77e11c5a38590758b14c68f7872983637aa95181 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
@@ -18,12 +18,17 @@ LauncherItemController::LauncherItemController(
     : 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();
@@ -36,6 +41,7 @@ string16 LauncherItemController::GetAppTitle() const {
 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: