Add AppLauncherId wrapper for items shown in shelf

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>
@@ skipping 33 matching lines @@
 
 // Values used for prefs::kShelfAutoHideBehavior.
 extern const char kShelfAutoHideBehaviorAlways[];
 extern const char kShelfAutoHideBehaviorNever[];
 
 // Values used for prefs::kShelfAlignment.
 extern const char kShelfAlignmentBottom[];
 extern const char kShelfAlignmentLeft[];
 extern const char kShelfAlignmentRight[];
 
+// A unique chrome launcher id used to identify a shelf item.
+class AppLauncherId {
+ public:
+  explicit AppLauncherId(const std::string& app_id);
+  ~AppLauncherId();
+
+  const std::string& GetAppLauncherID() const { return app_launcher_id_; }

[stevenjb, 2016/09/21 16:06:40]

This is confusing, it looks like it should return an AppLauncherId, i.e. just
'this'. Instead name this GetAsString().

[Andra Paraschiv, 2016/09/22 09:23:41]

Done.

+
+  bool operator==(const AppLauncherId& app_launcher_id) const {
+    return app_launcher_id.GetAppLauncherID() == app_launcher_id_;
+  }

[stevenjb, 2016/09/21 16:06:40]

Since neither of these methods are simple getters or accessors, and will become
less trivial in the follow-up CL, lets go ahead and implement them in the .cc
file with this CL.

[Andra Paraschiv, 2016/09/22 09:23:41]

Done.

+
+ private:
+  // A unique chrome launcher id for a shelf item.
+  const std::string app_launcher_id_;
+
+  DISALLOW_COPY_AND_ASSIGN(AppLauncherId);
+};
+
 void RegisterChromeLauncherUserPrefs(
     user_prefs::PrefRegistrySyncable* registry);
 
-base::DictionaryValue* CreateAppDict(const std::string& app_id);
+base::DictionaryValue* CreateAppDict(AppLauncherId* app_launcher_id);

[stevenjb, 2016/09/21 16:06:40]

Generally prefer const AppLauncherId& for input parameters throughout.

[Andra Paraschiv, 2016/09/22 09:23:41]

Done.

 
 // Get or set the shelf auto hide behavior preference for a particular display.
 ShelfAutoHideBehavior GetShelfAutoHideBehaviorPref(PrefService* prefs,
                                                    int64_t display_id);
 void SetShelfAutoHideBehaviorPref(PrefService* prefs,
                                   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<std::string> GetPinnedAppsFromPrefs(
     const PrefService* prefs,
     LauncherControllerHelper* helper);
 
 // Removes information about pin position from sync model for the app.
-void RemovePinPosition(Profile* profile, const std::string& app_id);
+void RemovePinPosition(Profile* profile, AppLauncherId* app_launcher_id);
 
-// Updates information about pin position in sync model for the app |app_id|.
-// |app_id_before| optionally specifies an app that exists right before the
-// target app. |app_id_after| optionally specifies an app that exists right
-// after the target app.
+// Updates information about pin position in sync model for the app
+// |app_launcher_id|. |app_launcher_id_before| optionally specifies an app that
+// exists right before the target app. |app_launcher_id_after| optionally
+// specifies an app that exists right after the target app.
 void SetPinPosition(Profile* profile,
-                    const std::string& app_id,
-                    const std::string& app_id_before,
-                    const std::string& app_id_after);
+                    AppLauncherId* app_launcher_id,
+                    AppLauncherId* app_launcher_id_before,
+                    AppLauncherId* app_launcher_id_after);
 
 // Used to propagate remote preferences to local during the first run.
 class ChromeLauncherPrefsObserver
     : public syncable_prefs::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.
   syncable_prefs::PrefServiceSyncable* prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherPrefsObserver);
 };
 
 }  // namespace launcher
 }  // namespace ash
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_