diff options
author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 02:55:39 +0000 |
---|---|---|
committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 02:55:39 +0000 |
commit | c3a54ae2c9ac8dc5d093cc192388fdf686971b46 (patch) | |
tree | 6b979418bc51d32d5faf263308b5a31b2ff1db64 /chrome/installer/util/google_chrome_distribution.cc | |
parent | c100bb1bf56c6cc9ed2c03573432c578d8b4acaa (diff) | |
download | chromium_src-c3a54ae2c9ac8dc5d093cc192388fdf686971b46.zip chromium_src-c3a54ae2c9ac8dc5d093cc192388fdf686971b46.tar.gz chromium_src-c3a54ae2c9ac8dc5d093cc192388fdf686971b46.tar.bz2 |
System toast was trying to launch the per-user chrome
- forgot to pass along the system_install flag.
BUG=32474
TEST=see bug for instructions, you need to simulate a system level install.
TBR=huanr
Review URL: http://codereview.chromium.org/561080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.cc')
-rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index debf556..f07a4f2 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -532,7 +532,8 @@ void GoogleChromeDistribution::LaunchUserExperiment( } // User qualifies for the experiment. Launch chrome with --try-chrome=flavor. -void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) { +void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor, + bool system_install) { bool has_welcome_url = (flavor == 0); // Possibly add a url to launch depending on the experiment flavor. std::wstring options(StringPrintf(L"--%ls=%d", @@ -544,7 +545,8 @@ void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) { } // Launch chrome now. It will show the toast UI. int32 exit_code = 0; - if (!installer::LaunchChromeAndWaitForResult(false, options, &exit_code)) + if (!installer::LaunchChromeAndWaitForResult(system_install, + options, &exit_code)) return; // The chrome process has exited, figure out what happened. const wchar_t* outcome = NULL; |