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

chrome/browser/ui/ash/launcher/app_shortcut_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_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 
 // Item controller for an app shortcut. Shortcuts track app and launcher ids,
 // but do not have any associated windows (opening a shortcut will replace the
 // item with the appropriate LauncherItemController type).
 class AppShortcutLauncherItemController : public LauncherItemController {
  public:
   ~AppShortcutLauncherItemController() override;
 
   static AppShortcutLauncherItemController* Create(
       const std::string& app_id,
+      const std::string& app_shelf_id,
       ChromeLauncherController* controller);
 
   std::vector<content::WebContents*> GetRunningApplications();
 
   // LauncherItemController overrides:
   bool IsOpen() const override;
   bool IsVisible() const override;
   void Launch(ash::LaunchSource source, int event_flags) override;
   ash::ShelfItemDelegate::PerformedAction Activate(
       ash::LaunchSource source) override;
   ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
   ash::ShelfItemDelegate::PerformedAction ItemSelected(
       const ui::Event& event) override;
   base::string16 GetTitle() override;
   ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
   bool IsDraggable() override;
   bool CanPin() const override;
   bool ShouldShowTooltip() override;
   void Close() override;
 
   // Get the refocus url pattern, which can be used to identify this application
   // from a URL link.
   const GURL& refocus_url() const { return refocus_url_; }
   // Set the refocus url pattern. Used by unit tests.
   void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; }
 
   ChromeLauncherController* controller() { return chrome_launcher_controller_; }
 
+  const std::string& app_id() const { return app_id_; }
+
+  const std::string& app_shelf_id() const { return app_shelf_id_; }
+
  protected:
   AppShortcutLauncherItemController(const std::string& app_id,
+                                    const std::string& app_shelf_id,
                                     ChromeLauncherController* controller);
 
  private:
   // Get the last running application.
   content::WebContents* GetLRUApplication();
 
   // Returns true if this app matches the given |web_contents|. To accelerate
   // the matching, the app managing |extension| as well as the parsed
   // |refocus_pattern| get passed. If |is_app| is true, the application gets
   // first checked against its original URL since a windowed app might have
@@ skipping 19 matching lines @@
   bool AllowNextLaunchAttempt();
 
   GURL refocus_url_;
 
   // Since V2 applications can be undetectable after launching, this timer is
   // keeping track of the last launch attempt.
   base::Time last_launch_attempt_;
 
   ChromeLauncherController* chrome_launcher_controller_;
 
+  const std::string app_id_;
+
+  const std::string app_shelf_id_;

[stevenjb, 2016/08/29 15:56:30]

Document these

[Andra Paraschiv, 2016/08/30 09:58:24]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_