Discard pinning an app with non-empty launcher id.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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_launcher_controller_mus.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/app_launcher_id.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_constants.h"
 
 class ChromeShelfItemDelegate : public ash::mojom::ShelfItemDelegate {
  public:
   explicit ChromeShelfItemDelegate(const std::string& app_id,
                                    ChromeLauncherController* controller)
@@ skipping 251 matching lines @@
 void ChromeLauncherControllerMus::PinAppsFromPrefs() {
   if (!ConnectToShelfController())
     return;
 
   std::vector<ash::launcher::AppLauncherId> pinned_apps =
       ash::launcher::GetPinnedAppsFromPrefs(profile()->GetPrefs(),
                                             launcher_controller_helper());
 
   for (const auto& app_launcher_id : pinned_apps) {
     const std::string app_id = app_launcher_id.app_id();
-    if (app_launcher_id.ToString() == ash::launcher::kPinnedAppsPlaceholder)
+    if (app_launcher_id.app_id() == ash::launcher::kPinnedAppsPlaceholder)
       continue;
 
     ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());
     item->app_id = app_id;
     item->app_title = base::UTF16ToUTF8(
         launcher_controller_helper()->GetAppTitle(profile(), app_id));
     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_id, this));
     shelf_controller()->PinItem(std::move(item),
                                 delegate->CreateInterfacePtrInfoAndBind(
                                     shelf_controller().associated_group()));
     app_id_to_item_delegate_.insert(
         std::make_pair(app_id, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }