diff options
| author | scottmg <scottmg@chromium.org> | 2016-02-10 17:00:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-11 01:02:28 +0000 |
| commit | 99230da5e39ce56f28f05a515941fae53ba5eded (patch) | |
| tree | 9031ae5880817c6f2d85e9999e0dc0575271258e /chrome/browser/ui/extensions/app_launch_params.cc | |
| parent | 3726ee3a4f55e7528d27f67549d717f12b8df278 (diff) | |
| download | chromium_src-99230da5e39ce56f28f05a515941fae53ba5eded.zip chromium_src-99230da5e39ce56f28f05a515941fae53ba5eded.tar.gz chromium_src-99230da5e39ce56f28f05a515941fae53ba5eded.tar.bz2 | |
Remove HostDesktopType from AppLaunchParams
R=sky@chromium.org, benwells@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1685883003
Cr-Commit-Position: refs/heads/master@{#374814}
Diffstat (limited to 'chrome/browser/ui/extensions/app_launch_params.cc')
| -rw-r--r-- | chrome/browser/ui/extensions/app_launch_params.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/chrome/browser/ui/extensions/app_launch_params.cc b/chrome/browser/ui/extensions/app_launch_params.cc index 80dab73..f099ad5 100644 --- a/chrome/browser/ui/extensions/app_launch_params.cc +++ b/chrome/browser/ui/extensions/app_launch_params.cc @@ -22,7 +22,6 @@ 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), @@ -31,32 +30,11 @@ 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), |