Remove HostDesktopType from AppLaunchParams

chrome/browser/ui/extensions/app_launch_params.h

Index: chrome/browser/ui/extensions/app_launch_params.h
diff --git a/chrome/browser/ui/extensions/app_launch_params.h b/chrome/browser/ui/extensions/app_launch_params.h
index c95cc5a1cae097c93808762e317092ca73414836..f6438baccbb3d1db2b8b8a14563ca1ab81068ba8 100644
--- a/chrome/browser/ui/extensions/app_launch_params.h
+++ b/chrome/browser/ui/extensions/app_launch_params.h
@@ -9,7 +9,6 @@
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/common/constants.h"
 #include "ui/base/window_open_disposition.h"
@@ -29,23 +28,6 @@ struct AppLaunchParams {
                   WindowOpenDisposition disposition,
                   extensions::AppLaunchSource source);
 
-  // Helper to create AppLaunchParams using extensions::GetLaunchContainer with
-  // LAUNCH_TYPE_REGULAR to check for a user-configured container.
-  AppLaunchParams(Profile* profile,
-                  const extensions::Extension* extension,
-                  WindowOpenDisposition disposition,
-                  extensions::AppLaunchSource source);
-
-  // Helper to create AppLaunchParams using event flags that allows user to
-  // override the user-configured container using modifier keys, falling back to
-  // extensions::GetLaunchContainer() with no modifiers. |desktop_type|
-  // indicates the desktop upon which to launch (Ash or Native).
-  AppLaunchParams(Profile* profile,
-                  const extensions::Extension* extension,
-                  WindowOpenDisposition disposition,
-                  chrome::HostDesktopType desktop_type,
-                  extensions::AppLaunchSource source);
-
   AppLaunchParams(const AppLaunchParams& other);
 
   ~AppLaunchParams();
@@ -62,9 +44,6 @@ struct AppLaunchParams {
   // If container is TAB, this field controls how the tab is opened.
   WindowOpenDisposition disposition;
 
-  // The desktop type to launch on. Uses GetActiveDesktop() if unspecified.
-  chrome::HostDesktopType desktop_type;
-
   // If non-empty, use override_url in place of the application's launch url.
   GURL override_url;
 
@@ -85,4 +64,21 @@ struct AppLaunchParams {
   extensions::AppLaunchSource source;
 };
 
+// Helper to create AppLaunchParams using extensions::GetLaunchContainer with
+// LAUNCH_TYPE_REGULAR to check for a user-configured container.
+AppLaunchParams CreateAppLaunchParamsUserContainer(
+    Profile* profile,
+    const extensions::Extension* extension,
+    WindowOpenDisposition disposition,
+    extensions::AppLaunchSource source);
+
+// Helper to create AppLaunchParams using event flags that allows user to
+// override the user-configured container using modifier keys, falling back to
+// extensions::GetLaunchContainer() with no modifiers.
+AppLaunchParams CreateAppLaunchParamsOverriddenContainer(
+    Profile* profile,
+    const extensions::Extension* extension,
+    WindowOpenDisposition raw_disposition,
+    extensions::AppLaunchSource source);
+
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_APP_LAUNCH_PARAMS_H_