mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/chrome_launcher_prefs.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_CHROME_LAUNCHER_PREFS_H_
 #define CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/public/cpp/shelf_types.h"
 #include "base/macros.h"
 #include "components/sync_preferences/pref_service_syncable_observer.h"
 
 class LauncherControllerHelper;
 class PrefService;
 class Profile;
 
 namespace sync_preferences {
 class PrefServiceSyncable;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace ash {

[James Cook, 2017/05/04 16:38:49]

Hey, while you're here can you take this file out of namespace ash? I don't
think we should be using namespace ash in chrome code.

[msw, 2017/05/04 19:05:57]

I 100% agree, but I'll do it in a followup, this CL is too big already.

[James Cook, 2017/05/04 19:45:08]

SGTM

-
-class AppLaunchId;
-
 namespace launcher {
 
 // Path within the dictionary entries in the prefs::kPinnedLauncherApps list
 // specifying the extension ID of the app to be pinned by that entry.
 extern const char kPinnedAppsPrefAppIDPath[];
 
 extern const char kPinnedAppsPrefPinnedByPolicy[];
 
 // Value used as a placeholder in the list of pinned applications.
 // This is NOT a valid extension identifier so pre-M31 versions ignore it.
@@ skipping 18 matching lines @@
                                   int64_t display_id,
                                   ShelfAutoHideBehavior behavior);
 
 // Get or set the shelf alignment preference for a particular display.
 ShelfAlignment GetShelfAlignmentPref(PrefService* prefs, int64_t display_id);
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
                            ShelfAlignment alignment);
 
 // Get the list of pinned apps from preferences.
-std::vector<AppLaunchId> GetPinnedAppsFromPrefs(
-    const PrefService* prefs,
-    LauncherControllerHelper* helper);
+std::vector<ShelfID> GetPinnedAppsFromPrefs(const PrefService* prefs,
+                                            LauncherControllerHelper* helper);
 
-// Removes information about pin position from sync model for the app. Note,
-// |app_launch_id| with non-empty launch_id is not supported.
-void RemovePinPosition(Profile* profile, const AppLaunchId& app_launch_id);
+// Removes information about pin position from sync model for the app.
+// Note, |shelf_id| with non-empty launch_id is not supported.
+void RemovePinPosition(Profile* profile, const ShelfID& shelf_id);
 
-// Updates information about pin position in sync model for the app
-// |app_launch_id|. |app_launch_id_before| optionally specifies an app that
-// exists right before the target app. |app_launch_ids_after| optionally
-// specifies sorted by position apps that exist right after the target app.
-// Note, |app_launch_id| with non-empty launch_id is not supported.
+// Updates information about pin position in sync model for the app |shelf_id|.
+// |shelf_id_before| optionally specifies an app that exists right before the
+// target app. |shelf_ids_after| optionally specifies sorted by position apps
+// that exist right after the target app.
+// Note, |shelf_id| with non-empty launch_id is not supported.
 void SetPinPosition(Profile* profile,
-                    const AppLaunchId& app_launch_id,
-                    const AppLaunchId& app_launch_id_before,
-                    const std::vector<AppLaunchId>& app_launch_ids_after);
+                    const ShelfID& shelf_id,
+                    const ShelfID& shelf_id_before,
+                    const std::vector<ShelfID>& shelf_ids_after);
 
 // Used to propagate remote preferences to local during the first run.
 class ChromeLauncherPrefsObserver
     : public sync_preferences::PrefServiceSyncableObserver {
  public:
   // Creates and returns an instance of ChromeLauncherPrefsObserver if the
   // profile prefs do not contain all the necessary local settings for the
   // shelf. If the local settings are present, returns null.
   static std::unique_ptr<ChromeLauncherPrefsObserver> CreateIfNecessary(
       Profile* profile);
@@ skipping 10 matching lines @@
   // Profile prefs. Not owned.
   sync_preferences::PrefServiceSyncable* prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherPrefsObserver);
 };
 
 }  // namespace launcher
 }  // namespace ash
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_