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

chrome/browser/ui/ash/launcher/launcher_item_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/events/event.h"
 
 class AppWindowLauncherItemController;
 class ChromeLauncherController;
 
 using MenuItemList = std::vector<ash::mojom::MenuItemPtr>;
 
 // LauncherItemController is used by ChromeLauncherController to track one
 // or more windows associated with a shelf item.
-// TODO (khmel): Consider using ash::AppLauncherId instead of pair
+// TODO (khmel): Consider using ash::AppLaunchId instead of pair
 // |app_id| and |launch_id|.
 class LauncherItemController : public ash::mojom::ShelfItemDelegate {
  public:
   LauncherItemController(const std::string& app_id,
                          const std::string& launch_id,
                          ChromeLauncherController* launcher_controller);
   ~LauncherItemController() override;
 
   ash::ShelfID shelf_id() const { return shelf_id_; }
   void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
@@ skipping 41 matching lines @@
   // applications.
   int locked_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_