Add AppLauncherId wrapper for items shown in shelf

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

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
@@ skipping 86 matching lines @@
   PinAppsFromPrefs();
 
   // Start observing the shelf now that it has been initialized.
   ash::mojom::ShelfObserverAssociatedPtrInfo ptr_info;
   observer_binding_.Bind(&ptr_info, shelf_controller_.associated_group());
   shelf_controller_->AddObserver(std::move(ptr_info));
 }
 
 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());
     }
   }
 }
 
 AppIconLoader* ChromeMashShelfController::GetAppIconLoaderForApp(
     const std::string& app_id) {
   for (const auto& app_icon_loader : app_icon_loaders_) {
     if (app_icon_loader->CanLoadImageForApp(app_id))
       return app_icon_loader.get();
   }
@@ skipping 31 matching lines @@
   // This will uselessly store a preference value for invalid display ids.
   ash::launcher::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(), display_id,
       auto_hide);
 }
 
 void ChromeMashShelfController::OnAppImageUpdated(const std::string& app_id,
                                                   const gfx::ImageSkia& image) {
   shelf_controller_->SetItemImage(app_id, *image.bitmap());
 }