Make management.launchApp() work for hosted apps on Athena

chrome/browser/ui/extensions/application_launch.h

Index: chrome/browser/ui/extensions/application_launch.h
diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h
index 5f07ae0c5ae7391cb07da7c1548b950434d2599e..63a331e7fd7387eee8ce731d0039941552fbc091 100644
--- a/chrome/browser/ui/extensions/application_launch.h
+++ b/chrome/browser/ui/extensions/application_launch.h
@@ -5,21 +5,11 @@
 #ifndef CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_
 #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_
 
-#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 "ui/base/window_open_disposition.h"
-#include "ui/gfx/rect.h"
+#include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "url/gurl.h"
 
-class Browser;
 class Profile;
 
-namespace base {
-class CommandLine;
-}
-
 namespace content {
 class WebContents;
 }
@@ -28,60 +18,6 @@ namespace extensions {
 class Extension;
 }
 
-struct AppLaunchParams {
-  AppLaunchParams(Profile* profile,
-                  const extensions::Extension* extension,
-                  extensions::LaunchContainer container,
-                  WindowOpenDisposition disposition);
-
-  // 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);
-
-  // 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,
-                  int event_flags,
-                  chrome::HostDesktopType desktop_type);
-
-  ~AppLaunchParams();
-
-  // The profile to load the application from.
-  Profile* profile;
-
-  // The extension to load.
-  std::string extension_id;
-
-  // The container type to launch the application in.
-  extensions::LaunchContainer container;
-
-  // 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;
-
-  // If non-empty, use override_boudns in place of the application's default
-  // position and dimensions.
-  gfx::Rect override_bounds;
-
-  // If non-empty, information from the command line may be passed on to the
-  // application.
-  base::CommandLine command_line;
-
-  // If non-empty, the current directory from which any relative paths on the
-  // command line should be expanded from.
-  base::FilePath current_directory;
-};
-
 // Opens the application, possibly prompting the user to re-enable it.
 void OpenApplicationWithReenablePrompt(const AppLaunchParams& params);
 
@@ -100,10 +36,4 @@ content::WebContents* OpenAppShortcutWindow(Profile* profile,
 // chrome.app.runtime.onLaunched event.
 bool CanLaunchViaEvent(const extensions::Extension* extension);
 
-// Get the launch URL for a given extension, with optional override/fallback.
-// |override_url|, if non-empty, will be preferred over the extension's
-// launch url.
-GURL UrlForExtension(const extensions::Extension* extension,
-                     const GURL& override_url);
-
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_