From 0c294877146c3812e0a69a5a6ec0cf3e29803954 Mon Sep 17 00:00:00 2001 From: "kuchhal@chromium.org" Date: Fri, 7 Nov 2008 01:05:51 +0000 Subject: * 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 --- chrome/installer/setup/main.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome/installer') 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()) { -- cgit v1.1