diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 13:51:55 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 13:51:55 +0000 |
| commit | 273073ec89349507ae18d1ecc0c99f0f86d54897 (patch) | |
| tree | fb3ccc64003dc22ffc5e8cbc176c90d152ba3465 /chrome/installer/util/google_chrome_distribution.h | |
| parent | 1835b9e20249b9c4840aa5710e3e8c72f592b62a (diff) | |
| download | chromium_src-273073ec89349507ae18d1ecc0c99f0f86d54897.zip chromium_src-273073ec89349507ae18d1ecc0c99f0f86d54897.tar.gz chromium_src-273073ec89349507ae18d1ecc0c99f0f86d54897.tar.bz2 | |
Fix system-level toast for multi-install Chrome.
I believe this regressed in Chrome 9 (http://crrev.com/67818). $5 to whomever writes a test for this so it doesn't regress again.
Highlights:
* Don't DCHECK in setup_main when handling --system-level-toast
* Rename AppendUninstallFlags to AppendProductFlags
* Pass the product-specific flags to child invocations of setup.exe
* Propagage --verbose-logging to child invocations of setup.exe
BUG=114101
TEST=install system-level chrome (at HH:MM C:\some\path\mini_installer.exe --system-level --verbose-logging --multi-install --chrome), set brand="CHXX" in HKLM\SOFTWARE\Google\Update\ClientState\{8A69D345-D564-463c-AFF1-A69D9E530F96}, then update chrome (at HH:MM C:\some\newer\mini_installer.exe --system-level --verbose-logging --multi-install --chrome) and see that the toast appears. Also make sure it still works for user-level installs.
Review URL: https://chromiumcodereview.appspot.com/9465039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.h')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index afb22e7..f895382 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -84,7 +84,7 @@ class GoogleChromeDistribution : public BrowserDistribution { const FilePath& setup_path, installer::InstallStatus status, const Version& version, - const installer::Product& installation, + const installer::Product& product, bool system_level) OVERRIDE; // Assuming that the user qualifies, this function performs the inactive user |