Modifies the toast to append "--system-level" if a system-level install is attempting to relaunch setup.

The launch flow as it exists now is:
Update -> setup.exe --system-level-toast --> setup.exe --inactive-user-toast=0

the modified flow will be:
Update -> setup.exe --system-level-toast --> setup.exe --inactive-user-toast=0 --system-level

R=cpu
BUG=none
TEST=Run setup.exe --system-level-toast with a system-level install.  Toast should show.

Review URL: http://codereview.chromium.org/581003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index f07a4f2..157f3e1 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -121,9 +121,11 @@ int GetDirectoryWriteAgeInHours(const wchar_t* path) {
 
 // Launches again this same process with a single switch --|flag|=|value|.
 // Does not wait for the process to terminate.
-bool RelaunchSetup(const std::wstring& flag, int value) {
+bool RelaunchSetup(const std::wstring& flag, int value, bool system_install) {
   CommandLine cmd_line(CommandLine::ForCurrentProcess()->GetProgram());
   cmd_line.AppendSwitchWithValue(WideToASCII(flag), IntToWString(value));
+  if (system_install)
+    cmd_line.AppendSwitch(WideToASCII(installer_util::switches::kSystemLevel));
   return base::LaunchApp(cmd_line, false, false, NULL);
 }
 
@@ -528,7 +530,8 @@ void GoogleChromeDistribution::LaunchUserExperiment(
       GetExperimentGroup(kToastExpBaseGroup, flavor));
   // The experiment needs to be performed in a different process because
   // google_update expects the upgrade process to be quick and nimble.
-  RelaunchSetup(installer_util::switches::kInactiveUserToast, flavor);
+  RelaunchSetup(installer_util::switches::kInactiveUserToast, flavor,
+                system_install);
 }
 
 // User qualifies for the experiment. Launch chrome with --try-chrome=flavor.