diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 03:17:41 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 03:17:41 +0000 |
| commit | bb725dc739b494b0ca088ec52ea97381a384a0fa (patch) | |
| tree | e074c216c1d436ca22f413044e1bc31d96c912d9 /chrome/installer/util/google_chrome_distribution.h | |
| parent | b37533a535303d4eaec4a2ad7df3ccf90c84d7c4 (diff) | |
| download | chromium_src-bb725dc739b494b0ca088ec52ea97381a384a0fa.zip chromium_src-bb725dc739b494b0ca088ec52ea97381a384a0fa.tar.gz chromium_src-bb725dc739b494b0ca088ec52ea97381a384a0fa.tar.bz2 | |
Reverting this as it caused installer_unit_tests to fail. Please fix and reland.
Revert 49346 - Fix problem whereby the "-full" magic value is removed from the "ap" value when a differential update for CF fails (it should remain unless the update succeeds).
Also, fix problem with installer return codes being squashed. This was a regression introduced in http://src.chromium.org/viewvc/chrome?view=rev&revision=41322.
BUG=46051,40607
TEST=Cause a differential update to fail, observe that the "ap" value contains a "-full".
Review URL: http://codereview.chromium.org/2773002
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/2725007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49359 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 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index b35f0a2..fec4df2 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -38,6 +38,21 @@ class GoogleChromeDistribution : public BrowserDistribution { virtual std::wstring GetInstallSubDir(); + // This method generates the new value for Google Update "ap" key for Chrome + // based on whether we are doing incremental install (or not) and whether + // the install succeeded. + // - If install worked, remove the magic string (if present). + // - If incremental installer failed, append a magic string (if + // not present already). + // - If full installer failed, still remove this magic + // string (if it is present already). + // + // diff_install: tells whether this is incremental install or not. + // install_status: if 0, means installation was successful. + // value: current value of Google Update "ap" key. + std::wstring GetNewGoogleUpdateApKey(bool diff_install, + installer_util::InstallStatus status, const std::wstring& value); + virtual std::wstring GetPublisherName(); virtual std::wstring GetAppDescription(); |