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.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/launcher/launcher_types.h"
@@ skipping 32 matching lines @@
     ash::LauncherID item_id() const { return controller_->launcher_id(); }
 
    private:
     BrowserLauncherItemController* controller_;
   };
 
   BrowserLauncherItemController(Type type,
                                 aura::Window* window,
                                 TabStripModel* tab_model,
                                 ChromeLauncherController* launcher_controller,
-                                const std::string& app_id);
+                                const std::string& app_id,
+                                const std::string& v1_app_id);
   virtual ~BrowserLauncherItemController();
 
   // Sets up this BrowserLauncherItemController.
   void Init();
 
   // Creates and returns a new BrowserLauncherItemController for |browser|. This
   // returns NULL if a BrowserLauncherItemController is not needed for the
   // specified browser.
   static BrowserLauncherItemController* Create(Browser* browser);
 
@@ skipping 62 matching lines @@
   // Updates the launcher from |tab|.
   void UpdateLauncher(content::WebContents* tab);
 
   void UpdateAppState(content::WebContents* tab);
 
   ash::LauncherModel* launcher_model();
 
   // Browser window we're in.
   aura::Window* window_;
 
+  // If running a windowed V1 app with the new launcher, the app id needs to be
+  // remembered since an icon needs to be created/destroyed if not pinned.
+  std::string v1_app_id_;

[sky, 2013/02/19 17:55:56]

Do we really need app_id and v1_app_id? Don't we know |app_id| is from a v1 app
based on the type?

[Mr4D (OOO till 08-26), 2013/02/19 19:22:13]

Addressed as discussed.

+
   TabStripModel* tab_model_;
 
   // Whether this is associated with an incognito profile.
   const bool is_incognito_;
 
   // Loads launcher sized favicons for panels.
   scoped_ptr<LauncherFaviconLoader> favicon_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_LAUNCHER_ITEM_CONTROLLER_H_