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.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_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include "ash/launcher/launcher_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
 
 // LauncherItemController is used by ChromeLauncherController to track one
 // or more windows associated with a launcher item.
 class LauncherItemController {
  public:
   enum Type {
     TYPE_APP,
     TYPE_APP_PANEL,
     TYPE_EXTENSION_PANEL,
     TYPE_SHORTCUT,
-    TYPE_TABBED
+    TYPE_TABBED,
+    TYPE_WINDOWED_APP
   };
 
   LauncherItemController(Type type,
                          const std::string& app_id,
                          ChromeLauncherController* launcher_controller);
   virtual ~LauncherItemController();
 
   Type type() const { return type_; }
   ash::LauncherID launcher_id() const { return launcher_id_; }
   void set_launcher_id(ash::LauncherID id) { launcher_id_ = id; }
-  const std::string& app_id() const { return app_id_; }
+  virtual const std::string& app_id() const;
   ChromeLauncherController* launcher_controller() {
     return launcher_controller_;
   }
 
+  // Lock this item to the launcher without being pinned (windowed v1 apps).
+  void lock() { locked_++; }
+  void unlock() {
+    DCHECK(locked_);
+    locked_--;
+  }
+  bool locked() { return locked_ > 0; }
+
   // Returns the title for this item.
   virtual string16 GetTitle() = 0;
 
   // Returns true if this item controls |window|.
   virtual bool HasWindow(aura::Window* window) const = 0;
 
   // Returns true if this item is open.
   virtual bool IsOpen() const = 0;
 
   // Launches a new instance of the app associated with this item.
@@ skipping 32 matching lines @@
   // Returns an empty title if no matching extension can be found.
   string16 GetAppTitle() const;
 
  private:
   const Type type_;
   // App id will be empty if there is no app associated with the window.
   const std::string app_id_;
   ash::LauncherID launcher_id_;
   ChromeLauncherController* launcher_controller_;
 
+  // The lock counter which tells the launcher if the item can be removed from
+  // the launcher (0) or not (>0). It is being used for windowed V1
+  // applications.
+  int locked_;
+
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_