mash: Replace int ShelfIDs with AppLaunchID strings.

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>
 
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
@@ skipping 73 matching lines @@
 
   // Initializes this ChromeLauncherController.
   void Init();
 
   // Creates a new app item on the shelf for |item_delegate|.
   ash::ShelfID CreateAppLauncherItem(
       std::unique_ptr<ash::ShelfItemDelegate> item_delegate,
       ash::ShelfItemStatus status);
 
   // Returns the shelf item with the given id, or null if |id| isn't found.
-  const ash::ShelfItem* GetItem(ash::ShelfID id) const;
+  const ash::ShelfItem* GetItem(const ash::ShelfID& id) const;
 
   // Updates the type of an item.
-  void SetItemType(ash::ShelfID id, ash::ShelfItemType type);
+  void SetItemType(const ash::ShelfID& id, ash::ShelfItemType type);
 
   // Updates the running status of an item. It will also update the status of
   // browsers shelf item if needed.
-  void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status);
+  void SetItemStatus(const ash::ShelfID& id, ash::ShelfItemStatus status);
 
   // Closes or unpins the shelf item.
-  void CloseLauncherItem(ash::ShelfID id);
+  void CloseLauncherItem(const ash::ShelfID& id);
 
   // Returns true if the item identified by |id| is pinned.
-  bool IsPinned(ash::ShelfID id);
+  bool IsPinned(const ash::ShelfID& id);
 
   // Set the shelf item status for the V1 application with the given |app_id|.
   // Adds or removes an item as needed to respect the running and pinned state.
   void SetV1AppStatus(const std::string& app_id, ash::ShelfItemStatus status);
 
   // 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.
-  void Launch(ash::ShelfID id, int event_flags);
+  void Launch(const ash::ShelfID& id, int event_flags);
 
   // Closes the specified item.
-  void Close(ash::ShelfID id);
+  void Close(const ash::ShelfID& id);
 
   // Returns true if the specified item is open.
-  bool IsOpen(ash::ShelfID id);
+  bool IsOpen(const ash::ShelfID& id);
 
   // Returns true if the specified item is for a platform app.
-  bool IsPlatformApp(ash::ShelfID id);
+  bool IsPlatformApp(const ash::ShelfID& id);
 
-  // Opens a new instance of the application identified by the AppLaunchId.
+  // Opens a new instance of the application identified by the ShelfID.
   // Used by the app-list, and by pinned-app shelf items.
-  void LaunchApp(ash::AppLaunchId id,
+  void LaunchApp(const ash::ShelfID& id,
                  ash::ShelfLaunchSource source,
                  int event_flags);
 
   // If |app_id| is running, reactivates the app's most recently active window,
   // otherwise launches and activates the app.
   // Used by the app-list, and by pinned-app shelf items.
   void ActivateApp(const std::string& app_id,
                    ash::ShelfLaunchSource source,
                    int event_flags);
 
   // Set the image for a specific shelf item (e.g. when set by the app).
-  void SetLauncherItemImage(ash::ShelfID shelf_id, const gfx::ImageSkia& image);
+  void SetLauncherItemImage(const ash::ShelfID& shelf_id,
+                            const gfx::ImageSkia& image);
 
   // Notify the controller that the state of an non platform app's tabs
   // have changed,
   void UpdateAppState(content::WebContents* contents, AppState app_state);
 
   // Returns ShelfID for |contents|. If |contents| is not an app or is not
   // pinned, returns the id of browser shrotcut.
   ash::ShelfID GetShelfIDForWebContents(content::WebContents* contents);
 
   // Limits application refocusing to urls that match |url| for |id|.
-  void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url);
+  void SetRefocusURLPatternForTest(const ash::ShelfID& id, const GURL& url);
 
   // Activates a |window|. If |allow_minimize| is true and the system allows
   // it, the the window will get minimized instead.
   // Returns the action performed. Should be one of SHELF_ACTION_NONE,
   // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED.
   ash::ShelfAction ActivateWindowOrMinimizeIfActive(ui::BaseWindow* window,
                                                     bool allow_minimize);
 
   // Called when the active user has changed.
   void ActiveUserChanged(const std::string& user_email);
@@ skipping 40 matching lines @@
   bool ShelfBoundsChangesProbablyWithUser(ash::WmShelf* shelf,
                                           const AccountId& account_id) const;
 
   // Called when the user profile is fully loaded and ready to switch to.
   void OnUserProfileReadyToSwitch(Profile* profile);
 
   // Controller to launch ARC apps in deferred mode.
   ArcAppDeferredLauncherController* GetArcDeferredLauncher();
 
   // Get the launch ID for a given shelf ID.
-  const std::string& GetLaunchIDForShelfID(ash::ShelfID id);
+  const std::string& GetLaunchIDForShelfID(const ash::ShelfID& id);
 
   AppIconLoader* GetAppIconLoaderForApp(const std::string& app_id);
 
   // Sets the shelf auto-hide and/or alignment behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();
   void SetShelfAlignmentFromPrefs();
   void SetShelfBehaviorsFromPrefs();
 
   // Temporarily prevent pinned shelf item changes from updating the sync model.
   using ScopedPinSyncDisabler = std::unique_ptr<base::AutoReset<bool>>;
@@ skipping 15 matching lines @@
       std::unique_ptr<LauncherControllerHelper> helper);
   void SetAppIconLoadersForTest(
       std::vector<std::unique_ptr<AppIconLoader>>& loaders);
 
   void SetProfileForTest(Profile* profile);
 
   // Helpers that call through to corresponding ShelfModel functions.
   ash::ShelfID GetShelfIDForAppID(const std::string& app_id);
   ash::ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
                                              const std::string& launch_id);
-  const std::string& GetAppIDForShelfID(ash::ShelfID id);
+  const std::string& GetAppIDForShelfID(const ash::ShelfID& id);
   void PinAppWithID(const std::string& app_id);
   bool IsAppPinned(const std::string& app_id);
   void UnpinAppWithID(const std::string& app_id);
 
   // LauncherAppUpdater::Delegate:
   void OnAppInstalled(content::BrowserContext* browser_context,
                       const std::string& app_id) override;
   void OnAppUpdated(content::BrowserContext* browser_context,
                     const std::string& app_id) override;
   void OnAppUninstalledPrepared(content::BrowserContext* browser_context,
@@ skipping 10 matching lines @@
 
  private:
   friend class ChromeLauncherControllerTest;
   friend class LauncherPlatformAppBrowserTest;
   friend class ShelfAppBrowserTest;
   friend class TestChromeLauncherController;
 
   using WebContentsToAppIDMap = std::map<content::WebContents*, std::string>;
 
   // Creates a new app shortcut item and controller on the shelf at |index|.
-  ash::ShelfID CreateAppShortcutLauncherItem(
-      const ash::AppLaunchId& app_launch_id,
-      int index);
+  ash::ShelfID CreateAppShortcutLauncherItem(const ash::ShelfID& shelf_id,
+                                             int index);
 
   // Remembers / restores list of running applications.
   // Note that this order will neither be stored in the preference nor will it
   // remember the order of closed applications since it is only temporary.
   void RememberUnpinnedRunningApplicationOrder();
   void RestoreUnpinnedRunningApplicationOrder(const std::string& user_id);
 
   // Invoked when the associated browser or app is closed.
-  void RemoveShelfItem(ash::ShelfID id);
+  void RemoveShelfItem(const ash::ShelfID& id);
 
   // Internal helpers for pinning and unpinning that handle both
   // client-triggered and internal pinning operations.
   void DoPinAppWithID(const std::string& app_id);
   void DoUnpinAppWithID(const std::string& app_id, bool update_prefs);
 
   // Pin a running app with |shelf_id| internally to |index|.
-  void PinRunningAppInternal(int index, ash::ShelfID shelf_id);
+  void PinRunningAppInternal(int index, const ash::ShelfID& shelf_id);
 
   // Unpin a locked application. This is an internal call which converts the
   // model type of the given app index from a shortcut into an unpinned running
   // app.
   void UnpinRunningAppInternal(int index);
 
   // Updates pin position for the item specified by |id| in sync model.
-  void SyncPinPosition(ash::ShelfID id);
+  void SyncPinPosition(const ash::ShelfID& id);
 
   // Re-syncs shelf model.
   void UpdateAppLaunchersFromPref();
 
   // Schedules re-sync of shelf model.
   void ScheduleUpdateAppLaunchersFromPref();
 
   // Update the policy-pinned flag for each shelf item.
   void UpdatePolicyPinnedAppsFromPrefs();
 
@@ skipping 53 matching lines @@
   // AppSyncUIStateObserver:
   void OnAppSyncUIStatusChanged() override;
 
   // app_list::AppListSyncableService::Observer:
   void OnSyncModelUpdated() override;
 
   // sync_preferences::PrefServiceSyncableObserver:
   void OnIsSyncingChanged() override;
 
   // An internal helper to unpin a shelf item; this does not update prefs.
-  void UnpinShelfItemInternal(ash::ShelfID id);
+  void UnpinShelfItemInternal(const ash::ShelfID& id);
 
   static ChromeLauncherController* instance_;
 
   // The currently loaded profile used for prefs and loading extensions. This is
   // NOT necessarily the profile new windows are created with. Note that in
   // multi-profile use cases this might change over time.
   Profile* profile_ = nullptr;
 
   ash::ShelfModel* model_;
 
@@ skipping 48 matching lines @@
   using RunningAppListIds = std::vector<std::string>;
   using RunningAppListIdMap = std::map<std::string, RunningAppListIds>;
   RunningAppListIdMap last_used_running_application_order_;
 
   base::WeakPtrFactory<ChromeLauncherController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_