diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 04:59:48 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 04:59:48 +0000 |
| commit | 5f2cee8b6e2760e626646651556a808a4cd5a6b1 (patch) | |
| tree | 63d0385a235c5b0ee5cd8eb6d3c429debabfc98d /chrome/browser/google_update.cc | |
| parent | 403fe1585a183e133108e5a1564226e4f7654143 (diff) | |
| download | chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.zip chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.tar.gz chromium_src-5f2cee8b6e2760e626646651556a808a4cd5a6b1.tar.bz2 | |
Push the Omaha app guid into the browser distribution classes to remove compile-time differences between Chrome Frame and Chrome.
Review URL: http://codereview.chromium.org/361023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google_update.cc')
| -rw-r--r-- | chrome/browser/google_update.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/google_update.cc b/chrome/browser/google_update.cc index db00a71..5cddc0f 100644 --- a/chrome/browser/google_update.cc +++ b/chrome/browser/google_update.cc @@ -15,6 +15,7 @@ #include "base/thread.h" #include "base/win_util.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" @@ -287,10 +288,11 @@ bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, if (hr != S_OK) return ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, main_loop); + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); if (!install_if_newer) - hr = on_demand->CheckForUpdate(google_update::kChromeGuid, job_observer); + hr = on_demand->CheckForUpdate(dist->GetAppGuid().c_str(), job_observer); else - hr = on_demand->Update(google_update::kChromeGuid, job_observer); + hr = on_demand->Update(dist->GetAppGuid().c_str(), job_observer); if (hr != S_OK) return ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR, |