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

chrome/browser/ui/ash/launcher/browser_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/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 31 matching lines @@
                     !tab_model->profile()->IsGuestSession()) {
   DCHECK(window_);
   window_->AddObserver(this);
 }
 
 BrowserLauncherItemController::~BrowserLauncherItemController() {
   tab_model_->RemoveObserver(this);
   window_->RemoveObserver(this);
   if (launcher_id() > 0)
     launcher_controller()->CloseLauncherItem(launcher_id());
+  if (type() == TYPE_WINDOWED_APP)
+    launcher_controller()->UnlockV1AppWithID(LauncherItemController::app_id());
+}
+
+const std::string& BrowserLauncherItemController::app_id() const {
+  if (type() == TYPE_WINDOWED_APP)
+    return empty_app_id_;
+  return LauncherItemController::app_id();
 }
 
 void BrowserLauncherItemController::Init() {
   tab_model_->AddObserver(this);
   ash::LauncherItemStatus app_status =
       ash::wm::IsActiveWindow(window_) ?
       ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
-  if (type() != TYPE_TABBED) {
+  if (type() != TYPE_TABBED && type() != TYPE_WINDOWED_APP) {
     launcher_controller()->CreateAppLauncherItem(this, app_id(), app_status);
   } else {
     launcher_controller()->CreateTabbedLauncherItem(
         this,
         is_incognito_ ? ChromeLauncherController::STATE_INCOGNITO :
                         ChromeLauncherController::STATE_NOT_INCOGNITO,
         app_status);
+    if (type() == TYPE_WINDOWED_APP)
+      launcher_controller()->LockV1AppWithID(LauncherItemController::app_id());
   }
   // In testing scenarios we can get tab strips with no active contents.
   if (tab_model_->active_index() != TabStripModel::kNoTab)
     UpdateLauncher(tab_model_->GetActiveWebContents());
 }
 
 // static
 BrowserLauncherItemController* BrowserLauncherItemController::Create(
     Browser* browser) {
   // Under testing this can be called before the controller is created.
   if (!ChromeLauncherController::instance())
     return NULL;
 
   Type type;
   std::string app_id;
   if (browser->is_type_tabbed() || browser->is_type_popup()) {
     type = TYPE_TABBED;
+    if (!browser->is_type_tabbed() &&
+        browser->is_type_popup() &&
+        browser->is_app() &&
+        ChromeLauncherController::instance()->GetPerAppInterface()) {
+      app_id = web_app::GetExtensionIdFromApplicationName(
+                    browser->app_name());
+      // Only allow this for known applications. Some unit tests for example
+      // do not have one.
+      if (!app_id.empty())
+        type = TYPE_WINDOWED_APP;
+    }
   } else if (browser->is_app()) {
     if (browser->is_type_panel()) {
       if (browser->app_type() == Browser::APP_TYPE_CHILD)
         type = TYPE_EXTENSION_PANEL;
       else
         type = TYPE_APP_PANEL;
     } else {
       type = TYPE_TABBED;
     }
     app_id = web_app::GetExtensionIdFromApplicationName(browser->app_name());
@@ skipping 230 matching lines @@
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller()->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller()->model();
 }