Add AppLauncherId wrapper for items shown in shelf

chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

Index: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
index b3a8d26e93ac4f1844c860f2353ffe35c7f204ab..3c6af0f022ba9560ef55016d67047a9c09852bb3 100644
--- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
@@ -104,30 +104,33 @@ void ChromeMashShelfController::Init() {
 
 void ChromeMashShelfController::PinAppsFromPrefs() {
   Profile* profile = ProfileManager::GetActiveUserProfile();
-  std::vector<std::string> pinned_apps =
+  std::vector<ash::launcher::AppLauncherId> pinned_apps =
       ash::launcher::GetPinnedAppsFromPrefs(profile->GetPrefs(), &helper_);
 
-  for (const auto& app : pinned_apps) {
-    if (app == ash::launcher::kPinnedAppsPlaceholder)
+  for (const auto& app_launcher_id : pinned_apps) {
+    if (app_launcher_id.GetAsString() == ash::launcher::kPinnedAppsPlaceholder)
       continue;
 
     ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());
-    item->app_id = app;
-    item->app_title = mojo::String::From(helper_.GetAppTitle(profile, app));
+    item->app_id = app_launcher_id.GetAsString();

[James Cook, 2016/10/04 16:08:37]

nit: Given that you use app_launcher_id.GetAsString() 7 times, I would store the
result in a local variable (like |app_id| or something) and use that. It'll make
the line wrapping better.

[Andra Paraschiv, 2016/10/05 11:21:58]

Done.

+    item->app_title = mojo::String::From(
+        helper_.GetAppTitle(profile, app_launcher_id.GetAsString()));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
     item->image = *image.ToSkBitmap();
     std::unique_ptr<ChromeShelfItemDelegate> delegate(
-        new ChromeShelfItemDelegate(app, this));
+        new ChromeShelfItemDelegate(app_launcher_id.GetAsString(), this));
     shelf_controller_->PinItem(std::move(item),
                                delegate->CreateInterfacePtrInfoAndBind(
                                    shelf_controller_.associated_group()));
-    app_id_to_item_delegate_.insert(std::make_pair(app, std::move(delegate)));
+    app_id_to_item_delegate_.insert(
+        std::make_pair(app_launcher_id.GetAsString(), std::move(delegate)));
 
-    AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app);
+    AppIconLoader* app_icon_loader =
+        GetAppIconLoaderForApp(app_launcher_id.GetAsString());
     if (app_icon_loader) {
-      app_icon_loader->FetchImage(app);
-      app_icon_loader->UpdateImage(app);
+      app_icon_loader->FetchImage(app_launcher_id.GetAsString());
+      app_icon_loader->UpdateImage(app_launcher_id.GetAsString());
     }
   }
 }