diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 18:49:32 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 18:49:32 +0000 |
| commit | 287a019ed5d015185cab41f6c7156dc6c4cbcee7 (patch) | |
| tree | 2a4e4ab3b6809e6bd2e9a464fb54df745c9f86a6 /chrome | |
| parent | 10e048e2fdd9563e34fcfbe4e77bdd113a4308cc (diff) | |
| download | chromium_src-287a019ed5d015185cab41f6c7156dc6c4cbcee7.zip chromium_src-287a019ed5d015185cab41f6c7156dc6c4cbcee7.tar.gz chromium_src-287a019ed5d015185cab41f6c7156dc6c4cbcee7.tar.bz2 | |
We were reporting Google Update errors as error:0, due to the fact that we were not catching the failure code from Google Update and reporting it. This is now fixed.
This is mentioned on the side in this bug (although this check-in does not fix this bug)
BUG=1302580
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/google_update.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/google_update.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/google_update.cc b/chrome/browser/google_update.cc index 9a58c74..a929f86 100644 --- a/chrome/browser/google_update.cc +++ b/chrome/browser/google_update.cc @@ -258,6 +258,9 @@ bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, if (hr != S_OK) return ReportFailure(hr, GOOGLE_UPDATE_GET_RESULT_CALL_FAILED, main_loop); + if (results == UPGRADE_ERROR) + return ReportFailure(hr, GOOGLE_UPDATE_ERROR_UPDATING, main_loop); + hr = job_observer->GetVersionInfo(&version_available_); if (hr != S_OK) return ReportFailure(hr, GOOGLE_UPDATE_GET_VERSION_INFO_FAILED, main_loop); diff --git a/chrome/browser/google_update.h b/chrome/browser/google_update.h index 6d407c9..5e3d3cb 100644 --- a/chrome/browser/google_update.h +++ b/chrome/browser/google_update.h @@ -72,6 +72,9 @@ enum GoogleUpdateErrorCode { GOOGLE_UPDATE_GET_RESULT_CALL_FAILED, // A call to GetVersionInfo failed. GOOGLE_UPDATE_GET_VERSION_INFO_FAILED, + // An error occurred while upgrading (or while checking for update). + // Check the Google Update log in %TEMP% for more details. + GOOGLE_UPDATE_ERROR_UPDATING, }; // The GoogleUpdateStatusListener interface is used by components to receive |