Revert of Remove HostDesktopType from AppLaunchParams

chrome/browser/ui/extensions/app_launch_params.cc

Index: chrome/browser/ui/extensions/app_launch_params.cc
diff --git a/chrome/browser/ui/extensions/app_launch_params.cc b/chrome/browser/ui/extensions/app_launch_params.cc
index f099ad59b45acfa2f46e1c8b7148c33a86b21d96..80dab730223928003e4ac3a77f839fa98226c5bc 100644
--- a/chrome/browser/ui/extensions/app_launch_params.cc
+++ b/chrome/browser/ui/extensions/app_launch_params.cc
@@ -22,6 +22,7 @@ AppLaunchParams::AppLaunchParams(Profile* profile,
       extension_id(extension ? extension->id() : std::string()),
       container(container),
       disposition(disposition),
+      desktop_type(chrome::GetActiveDesktop()),
       override_url(),
       override_bounds(),
       command_line(base::CommandLine::NO_PROGRAM),
@@ -30,11 +31,32 @@ AppLaunchParams::AppLaunchParams(Profile* profile,
 
 AppLaunchParams::AppLaunchParams(Profile* profile,
                                  const extensions::Extension* extension,
+                                 WindowOpenDisposition disposition,
+                                 extensions::AppLaunchSource source)
+    : profile(profile),
+      extension_id(extension ? extension->id() : std::string()),
+      container(extensions::LAUNCH_CONTAINER_NONE),
+      disposition(disposition),
+      desktop_type(chrome::GetActiveDesktop()),
+      override_url(),
+      override_bounds(),
+      command_line(base::CommandLine::NO_PROGRAM),
+      source(source) {
+  // Look up the app preference to find out the right launch container. Default
+  // is to launch as a regular tab.
+  container =
+      extensions::GetLaunchContainer(ExtensionPrefs::Get(profile), extension);
+}
+
+AppLaunchParams::AppLaunchParams(Profile* profile,
+                                 const extensions::Extension* extension,
                                  WindowOpenDisposition raw_disposition,
+                                 chrome::HostDesktopType desktop_type,
                                  extensions::AppLaunchSource source)
     : profile(profile),
       extension_id(extension ? extension->id() : std::string()),
       container(extensions::LAUNCH_CONTAINER_NONE),
+      desktop_type(desktop_type),
       override_url(),
       override_bounds(),
       command_line(base::CommandLine::NO_PROGRAM),