From 99230da5e39ce56f28f05a515941fae53ba5eded Mon Sep 17 00:00:00 2001 From: scottmg Date: Wed, 10 Feb 2016 17:00:49 -0800 Subject: 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} --- chrome/browser/ui/extensions/app_launch_params.cc | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to '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 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), -- cgit v1.1