mash: Replace int ShelfIDs with AppLaunchID strings.

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

 // Copyright (c) 2012 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/app_shortcut_launcher_item_controller.h"
 
 #include <stddef.h>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 43 matching lines @@
   if (chrome::MultiUserWindowManager::GetMultiProfileMode() ==
           chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_OFF)
     return true;
   return multi_user_util::IsProfileFromActiveUser(browser->profile());
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<AppShortcutLauncherItemController>
-AppShortcutLauncherItemController::Create(
-    const ash::AppLaunchId& app_launch_id) {
-  if (app_launch_id.app_id() == ArcSupportHost::kHostAppId ||
-      app_launch_id.app_id() == arc::kPlayStoreAppId) {
+AppShortcutLauncherItemController::Create(const ash::ShelfID& shelf_id) {
+  if (shelf_id.app_id() == ArcSupportHost::kHostAppId ||
+      shelf_id.app_id() == arc::kPlayStoreAppId) {
     return base::MakeUnique<ArcPlaystoreShortcutLauncherItemController>();
   }
   return base::WrapUnique<AppShortcutLauncherItemController>(
-      new AppShortcutLauncherItemController(app_launch_id));
+      new AppShortcutLauncherItemController(shelf_id));
 }
 
 // Item controller for an app shortcut. Shortcuts track app and launcher ids,
 // but do not have any associated windows (opening a shortcut will replace the
 // item with the appropriate ash::ShelfItemDelegate type).
 AppShortcutLauncherItemController::AppShortcutLauncherItemController(
-    const ash::AppLaunchId& app_launch_id)
-    : ash::ShelfItemDelegate(app_launch_id) {
+    const ash::ShelfID& shelf_id)
+    : ash::ShelfItemDelegate(shelf_id) {
   // To detect V1 applications we use their domain and match them against the
   // used URL. This will also work with applications like Google Drive.
   const Extension* extension = GetExtensionForAppID(
-      app_launch_id.app_id(), ChromeLauncherController::instance()->profile());
+      shelf_id.app_id(), ChromeLauncherController::instance()->profile());
   // Some unit tests have no real extension.
   if (extension) {
     set_refocus_url(GURL(
         extensions::AppLaunchInfo::GetLaunchWebURL(extension).spec() + "*"));
   }
 }
 
 AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {}
 
 void AppShortcutLauncherItemController::ItemSelected(
@@ skipping 15 matching lines @@
     // which take a lot of time for pre-processing (like the files app) before
     // they open a window. Since there is currently no other way to detect if an
     // app was started we suppress any further clicks within a special time out.
     if (IsV2App() && !AllowNextLaunchAttempt()) {
       callback.Run(ash::SHELF_ACTION_NONE,
                    GetAppMenuItems(event ? event->flags() : ui::EF_NONE));
       return;
     }
 
     // Launching some items replaces this item controller instance, which
-    // destroys its AppLaunchId string pair; making copies avoid crashes.
-    ChromeLauncherController::instance()->LaunchApp(
-        ash::AppLaunchId(app_launch_id()), source, ui::EF_NONE);
+    // destroys its ShelfID string pair; making copies avoid crashes.
+    ChromeLauncherController::instance()->LaunchApp(ash::ShelfID(shelf_id()),
+                                                    source, ui::EF_NONE);
     callback.Run(ash::SHELF_ACTION_NEW_WINDOW_CREATED, base::nullopt);
     return;
   }
 
   const ash::ShelfAction action = ActivateContent(content);
   callback.Run(action, GetAppMenuItems(event ? event->flags() : ui::EF_NONE));
 }
 
 ash::MenuItemList AppShortcutLauncherItemController::GetAppMenuItems(
     int event_flags) {
@@ skipping 230 matching lines @@
 
 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
   if (last_launch_attempt_.is_null() ||
       last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
           kClickSuppressionInMS) < base::Time::Now()) {
     last_launch_attempt_ = base::Time::Now();
     return true;
   }
   return false;
 }