Combine shelf platform and windowed app types.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // Copyright 2013 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_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 99 matching lines @@
 
   // Pins/unpins the specified id.
   virtual void TogglePinned(ash::ShelfID id) = 0;
 
   // Returns true if the specified item can be pinned or unpinned. Only apps can
   // be pinned.
   virtual bool IsPinnable(ash::ShelfID id) const = 0;
 
   // If there is no shelf item in the shelf for application |app_id|, one
   // gets created. The (existing or created) shelf items get then locked
   // against a users un-pinning removal.

[James Cook, 2016/11/28 22:57:47]

Did you ever figure out what "locking" is used for? Enterprise policy stuff? If
so, feel free to expand this comment slightly. If not, don't bother.

[msw, 2016/11/28 23:47:41]

The comment seems reasonable (albeit incomplete), so I expanded a *tiny* bit.
Afaict, locking is simply the way V1 apps (eg. Chrome Web Store) are added to
the shelf as running, when their 'Open as window' context menu option is checked
and they are not pinned to the shelf. It seems like 'lock/unlock' are misnomers
for 'add/remove'. (found via experimentation and this comment and code path):
https://cs.chromium.org/chromium/src/chrome/browser/ui/browser.h?l=891
https://cs.chromium.org/chromium/src/chrome/browser/ui/ash/launcher/browser_s...

   virtual void LockV1AppWithID(const std::string& app_id) = 0;
 
   // A previously locked shelf 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) = 0;
 
   // Requests that the shelf 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::ShelfID id, int event_flags) = 0;
@@ skipping 20 matching lines @@
                            ash::LaunchSource source,
                            int event_flags) = 0;
 
   // Returns the launch type of app for the specified id.
   virtual extensions::LaunchType GetLaunchType(ash::ShelfID id) = 0;
 
   // Set the image for a specific shelf item (e.g. when set by the app).
   virtual void SetLauncherItemImage(ash::ShelfID shelf_id,
                                     const gfx::ImageSkia& image) = 0;
 
-  // Find out if the given application |id| is a windowed app item and not a
-  // pinned item in the shelf.
-  virtual bool IsWindowedAppInLauncher(const std::string& app_id) = 0;
-
   // Updates the launch type of the app for the specified id to |launch_type|.
   virtual void SetLaunchType(ash::ShelfID id,
                              extensions::LaunchType launch_type) = 0;
 
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   virtual void UpdateAppState(content::WebContents* contents,
                               AppState app_state) = 0;
 
   // Returns ShelfID for |contents|. If |contents| is not an app or is not
@@ skipping 140 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_