diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 01:05:51 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 01:05:51 +0000 |
| commit | 0c294877146c3812e0a69a5a6ec0cf3e29803954 (patch) | |
| tree | 37e77c947231cbe0ec3807aa0c91c3f77a0ba3fd /chrome/installer | |
| parent | a21e2e4be91a503c9d61ba9c0c717975749fb4f3 (diff) | |
| download | chromium_src-0c294877146c3812e0a69a5a6ec0cf3e29803954.zip chromium_src-0c294877146c3812e0a69a5a6ec0cf3e29803954.tar.gz chromium_src-0c294877146c3812e0a69a5a6ec0cf3e29803954.tar.bz2 | |
* Never launch Chrome in system level install mode.
Review URL: http://codereview.chromium.org/9479
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/main.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc index a553031..57730e3 100644 --- a/chrome/installer/setup/main.cc +++ b/chrome/installer/setup/main.cc @@ -318,7 +318,9 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line, if (install_status == installer_util::FIRST_INSTALL_SUCCESS) { LOG(INFO) << "First install successful."; CopyPreferenceFileForFirstRun(options, cmd_line); - if (options & installer_util::DO_NOT_LAUNCH_CHROME) { + // We never want to launch Chrome in system level install mode. + if ((options & installer_util::DO_NOT_LAUNCH_CHROME) || + (options & installer_util::SYSTEM_LEVEL)) { std::wstring chrome_exe = installer::GetChromeInstallPath(system_install); if (!chrome_exe.empty()) { |