Pin apps from prefs on the mash shelf.

chrome/browser/ui/ash/chrome_launcher_prefs.h

Index: chrome/browser/ui/ash/chrome_launcher_prefs.h
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.h b/chrome/browser/ui/ash/chrome_launcher_prefs.h
index de6fe245bb91cc6597c6f1b211a90a7884399eb0..86fe2bbed5371c4a19e663cfb1e4525ef3819771 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.h
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.h
@@ -6,9 +6,11 @@
 #define CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_
 
 #include <string>
+#include <vector>
 
 #include "ash/shelf/shelf_types.h"
 
+class LauncherControllerHelper;
 class PrefService;
 
 namespace base {
@@ -27,6 +29,10 @@ 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.
+extern const char kPinnedAppsPlaceholder[];
+
 // Values used for prefs::kShelfAutoHideBehavior.
 extern const char kShelfAutoHideBehaviorAlways[];
 extern const char kShelfAutoHideBehaviorNever[];
@@ -41,20 +47,25 @@ void RegisterChromeLauncherUserPrefs(
 
 base::DictionaryValue* CreateAppDict(const std::string& app_id);
 
-// Get or set the shelf auto hide behavior preference for a root window.
+// 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 root window.
+// Get or set the shelf alignment preference for a particular display.
 wm::ShelfAlignment GetShelfAlignmentPref(PrefService* prefs,
                                          int64_t display_id);
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
                            wm::ShelfAlignment alignment);
 
+// Get the list of pinned apps from preferences.
+std::vector<std::string> GetPinnedAppsFromPrefs(
+    PrefService* prefs,
+    LauncherControllerHelper* helper);
+
 }  // namespace ash
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_LAUNCHER_PREFS_H_