Move and rename Chrome's AppLauncherId to ash::AppLaunchId.

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 "ash/public/cpp/app_launch_id.h"
 #include "base/strings/string_util.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"
 
 ChromeLauncherControllerMus::ChromeLauncherControllerMus() {
   AttachProfile(ProfileManager::GetActiveUserProfile());
 }
 
@@ skipping 205 matching lines @@
   if (ConnectToShelfController())
     shelf_controller()->SetItemImage(app_id, *image.bitmap());
 }
 
 void ChromeLauncherControllerMus::OnInit() {}
 
 void ChromeLauncherControllerMus::PinAppsFromPrefs() {
   if (!ConnectToShelfController())
     return;
 
-  std::vector<ash::AppLauncherId> pinned_apps =
+  std::vector<ash::AppLaunchId> 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.app_id() == ash::launcher::kPinnedAppsPlaceholder)
+  for (const auto& app_launch_id : pinned_apps) {
+    const std::string app_id = app_launch_id.app_id();
+    if (app_launch_id.app_id() == ash::launcher::kPinnedAppsPlaceholder)
       continue;
 
     ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());
     item->app_id = app_id;
     item->title = 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();
     // TOOD(msw): Actually pin the item and install its delegate; this code is
     // unused at the moment. See http://crbug.com/647879
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }