mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_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/arc_app_window_launcher_item_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "ui/aura/window.h"
 #include "ui/base/base_window.h"
 
 ArcAppWindowLauncherItemController::ArcAppWindowLauncherItemController(
     const std::string& arc_app_id)
-    : AppWindowLauncherItemController(ash::AppLaunchId(arc_app_id)) {}
+    : AppWindowLauncherItemController(ash::ShelfID(arc_app_id)) {}
 
 ArcAppWindowLauncherItemController::~ArcAppWindowLauncherItemController() {}
 
 void ArcAppWindowLauncherItemController::AddTaskId(int task_id) {
   task_ids_.insert(task_id);
 }
 
 void ArcAppWindowLauncherItemController::RemoveTaskId(int task_id) {
   task_ids_.erase(task_id);
 }
@@ skipping 37 matching lines @@
     size_t i = std::distance(windows().begin(), it);
     aura::Window* window = (*it)->GetNativeWindow();
     ash::mojom::MenuItemPtr item = ash::mojom::MenuItem::New();
     item->command_id = base::checked_cast<uint32_t>(i);
     item->label = (window && !window->GetTitle().empty()) ? window->GetTitle()
                                                           : app_title;
     items.push_back(std::move(item));
   }
   return items;
 }