diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 21:38:02 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 21:38:02 +0000 |
| commit | 89a5616f0bdd3842854f559de57ad84a13690210 (patch) | |
| tree | 1c5dd24519c150c94936abfb2b6994067e7cae7c /chrome/installer | |
| parent | 5c8ee43d773ee0a1877db2e5dffc3e57a6873f67 (diff) | |
| download | chromium_src-89a5616f0bdd3842854f559de57ad84a13690210.zip chromium_src-89a5616f0bdd3842854f559de57ad84a13690210.tar.gz chromium_src-89a5616f0bdd3842854f559de57ad84a13690210.tar.bz2 | |
Convert the remaining callers of LaunchApp to LaunchProcess.
And delete temporary shims.
BUG=88990
Review URL: http://codereview.chromium.org/7386010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/test/alternate_version_generator.cc | 5 | ||||
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index ac57b66..7300c1e 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -504,7 +504,7 @@ bool CheckPreInstallConditions(const InstallationState& original_state, cmd.AppendSwitch(switches::kFirstRun); installer_state->WriteInstallerResult(*status, 0, NULL); VLOG(1) << "Launching existing system-level chrome instead."; - base::LaunchApp(cmd, false, false, NULL); + base::LaunchProcess(cmd, base::LaunchOptions(), NULL); } return false; } diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index 7af5cc6..0ba20d15a 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -195,7 +195,10 @@ bool RunProcessAndWait(const wchar_t* exe_path, const std::wstring& cmdline, int* exit_code) { bool result = true; base::ProcessHandle process; - if (base::LaunchApp(cmdline, true, true, &process)) { + base::LaunchOptions options; + options.wait = true; + options.start_hidden = true; + if (base::LaunchProcess(cmdline, options, &process)) { if (exit_code) { if (!GetExitCodeProcess(process, reinterpret_cast<DWORD*>(exit_code))) { diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 11d2128..3570510 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -144,8 +144,7 @@ bool LaunchSetup(CommandLine cmd_line, bool system_level_toast) { } } - return base::LaunchApp(cmd_line.command_line_string(), - false, false, NULL); + return base::LaunchProcess(cmd_line, base::LaunchOptions(), NULL); } // For System level installs, setup.exe lives in the system temp, which |