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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 105 matching lines @@
   // Returns true if the item identified by |id| is pinned.
   virtual bool IsPinned(ash::LauncherID id) OVERRIDE;
 
   // Pins/unpins the specified id.
   virtual void TogglePinned(ash::LauncherID id) OVERRIDE;
 
   // Returns true if the specified item can be pinned or unpinned. Only apps can
   // be pinned.
   virtual bool IsPinnable(ash::LauncherID id) const OVERRIDE;
 
+  // If there is no launcher item in the launcher for application |app_id|, one
+  // gets created. The (existing or created) launcher items get then locked
+  // against a users un-pinning removal.
+  virtual void LockV1AppWithID(const std::string& app_id) OVERRIDE;
+
+  // A previously locked launcher item of type |app_id| gets unlocked. If the
+  // lock count reaches 0 and the item is not pinned it will go away.
+  virtual void UnlockV1AppWithID(const std::string& app_id) OVERRIDE;
+
   // Requests that the launcher item controller specified by |id| open a new
   // instance of the app.  |event_flags| holds the flags of the event which
   // triggered this command.
   virtual void Launch(ash::LauncherID id, int event_flags) OVERRIDE;
 
   // Closes the specified item.
   virtual void Close(ash::LauncherID id) OVERRIDE;
 
   // Returns true if the specified item is open.
   virtual bool IsOpen(ash::LauncherID id) OVERRIDE;
@@ skipping 22 matching lines @@
       const std::string& app_id) OVERRIDE;
   virtual std::string GetAppIDForLauncherID(ash::LauncherID id) OVERRIDE;
 
   // Set the image for a specific launcher item (e.g. when set by the app).
   virtual void SetLauncherItemImage(ash::LauncherID launcher_id,
                                     const gfx::ImageSkia& image) OVERRIDE;
 
   // Returns true if a pinned launcher item with given |app_id| could be found.
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
 
+  // Find out if the given application |id| is a windowed app item and not a
+  // pinned item in the launcher.
+  bool IsWindowedAppInLauncher(const std::string& app_id);
+
   // Pins an app with |app_id| to launcher. If there is a running instance in
   // launcher, the running instance is pinned. If there is no running instance,
   // a new launcher item is created and pinned.
   virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
 
   // Updates the launche type of the app for the specified id to |launch_type|.
   virtual void SetLaunchType(
       ash::LauncherID id,
       extensions::ExtensionPrefs::LaunchType launch_type) OVERRIDE;
 
@@ skipping 133 matching lines @@
   // These are intended for testing.
   virtual void SetAppTabHelperForTest(AppTabHelper* helper) OVERRIDE;
   virtual void SetAppIconLoaderForTest(ash::AppIconLoader* loader) OVERRIDE;
   virtual const std::string& GetAppIdFromLauncherIdForTest(
       ash::LauncherID id) OVERRIDE;
 
  private:
   friend class ChromeLauncherControllerPerAppTest;
   friend class LauncherPerAppAppBrowserTest;
 
+  // Creates a new app shortcut item and controller on the launcher at |index|.
+   // Use kInsertItemAtEnd to add a shortcut as the last item.
+   virtual ash::LauncherID CreateAppShortcutLauncherItemWithType(
+       const std::string& app_id,
+       int index,
+       ash::LauncherItemType launcher_item_type);
+
   // Updates the activation state of the Broswer item.
   void UpdateBrowserItemStatus();
 
   typedef std::map<ash::LauncherID, LauncherItemController*>
           IDToItemControllerMap;
   typedef std::list<content::WebContents*> WebContentsList;
   typedef std::map<std::string, WebContentsList> AppIDToWebContentsListMap;
   typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
 
   // Returns the profile used for new windows.
@@ skipping 21 matching lines @@
   void SetShelfAlignmentFromPrefs();
 
   // Sets both of auto-hide behavior and alignment from prefs.
   void SetShelfBehaviorsFromPrefs();
 
   // Returns the most recently active web contents for an app.
   content::WebContents* GetLastActiveWebContents(const std::string& app_id);
 
   // Creates an app launcher to insert at |index|. Note that |index| may be
   // adjusted by the model to meet ordering constraints.
+  // The |launcher_item_type| will be set into the LauncherModel.
   ash::LauncherID InsertAppLauncherItem(
       LauncherItemController* controller,
       const std::string& app_id,
       ash::LauncherItemStatus status,
-      int index);
+      int index,
+      ash::LauncherItemType launcher_item_type);
 
   bool HasItemController(ash::LauncherID id) const;
 
   // Enumerate all Web contents which match a given shortcut |controller|.
   std::vector<content::WebContents*> GetV1ApplicationsFromController(
       LauncherItemController* controller);
 
   // Returns the list of all browsers runing.
   // TODO(skuhne): Move to wherever the BrowserLauncherItemController
   // functionality moves to.
@@ skipping 27 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
 
   AppSyncUIState* app_sync_ui_state_;
 
   scoped_ptr<ExtensionEnableFlow> extension_enable_flow_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerPerApp);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_PER_APP_H_