Remove LauncherItemController::Launch, cleanup.

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

 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 117 matching lines @@
   // Closes the specified item.
   virtual void Close(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is open.
   virtual bool IsOpen(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is for a platform app.
   virtual bool IsPlatformApp(ash::ShelfID id) = 0;
 
   // Opens a new instance of the application identified by |app_id|.
+  // The |launch_id| is used to support multiple shelf items per app.
   // Used by the app-list, and by pinned-app shelf items.
   void LaunchApp(const std::string& app_id,
+                 const std::string& launch_id,

[James Cook, 2017/02/08 17:37:00]

I think this would be better if it took an AppLauncherId (from
chrome_launcher_prefs.h, though it really ought to be in chrome_launcher_types.h
or its own file). That class encapsulates both app_id and launch_id so you don't
have to pass two adjacent strings as arguments.

[khmel, 2017/02/08 17:41:27]

+1 to this. There is also CL: https://codereview.chromium.org/2684853002/ where
AppLauncherId is moved to separate file.

[msw, 2017/02/09 00:42:00]

Done.

                  ash::LaunchSource source,
                  int event_flags);
 
-  // As above but includes |launch_id|, an id that can be passed to an app when
-  // launched in order to support multiple shelf items per app.
-  void LaunchAppWithLaunchId(const std::string& app_id,
-                             const std::string& launch_id,
-                             ash::LaunchSource source,
-                             int event_flags);
-
   // If |app_id| is running, reactivates the app's most recently active window,
   // otherwise launches and activates the app.
   // Used by the app-list, and by pinned-app shelf items.
   virtual void ActivateApp(const std::string& app_id,
                            ash::LaunchSource source,
                            int event_flags) = 0;
 
   // Set the image for a specific shelf item (e.g. when set by the app).
   virtual void SetLauncherItemImage(ash::ShelfID shelf_id,
                                     const gfx::ImageSkia& image) = 0;
@@ skipping 155 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_