Enhance chrome.app.window API for shelf integration with pinning support

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 <string>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
@@ skipping 24 matching lines @@
  public:
   enum Type {
     TYPE_APP,
     TYPE_APP_PANEL,
     TYPE_SHORTCUT,
     TYPE_WINDOWED_APP
   };
 
   LauncherItemController(Type type,
                          const std::string& app_id,
+                         const std::string& launch_id,
                          ChromeLauncherController* launcher_controller);
   ~LauncherItemController() override;
 
   Type type() const { return type_; }
   ash::ShelfID shelf_id() const { return shelf_id_; }
   void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
   const std::string& app_id() const { return app_id_; }
+  const std::string& launch_id() const { return launch_id_; }
   ChromeLauncherController* launcher_controller() const {
     return launcher_controller_;
   }
 
   // Lock this item to the launcher without being pinned (windowed v1 apps).
   void lock() { locked_++; }
   void unlock() {
     DCHECK(locked_);
     locked_--;
   }
@@ skipping 21 matching lines @@
   // Called to retrieve the list of running applications.
   virtual ChromeLauncherAppMenuItems GetApplicationList(int event_flags) = 0;
 
   // Helper function to get the ash::ShelfItemType for the item type.
   ash::ShelfItemType GetShelfItemType() const;
 
  private:
   const Type type_;
   // App id will be empty if there is no app associated with the window.
   const std::string app_id_;
+  // The launch id associated with the window.

[stevenjb, 2016/08/31 18:24:28]

This doesn't explain what a 'launch id' is. This should be something like:
// An id that can be passed to an app when launched in order to support multiple
shelf (launcher) items per app.

[Andra Paraschiv, 2016/09/01 08:27:25]

Done.

+  const std::string launch_id_;
   ash::ShelfID shelf_id_;

[stevenjb, 2016/08/31 18:24:27]

Add a comment for shelf_id to help reduce the naming confusion, e.g.:
// A unique id for the shelf item (based on app_id and launch_id).

[Andra Paraschiv, 2016/09/01 08:27:25]

Done.

   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_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_