| 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 7d34e714795cce6b214d2472b32bd38affe1c4fb..3b69479c6c798b17f29bb1d516b9fda03de41f45 100644
|
| --- a/chrome/browser/ui/extensions/app_launch_params.h
|
| +++ b/chrome/browser/ui/extensions/app_launch_params.h
|
| @@ -29,12 +29,21 @@ 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.
|
| + // 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();
|
| @@ -51,6 +60,9 @@ 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;
|
|
|
|
|