From dd224e13b5371d1d313424247eea37f5b0d20acb Mon Sep 17 00:00:00 2001 From: "siggi@chromium.org" Date: Tue, 20 Apr 2010 17:04:09 +0000 Subject: Make sure GoogleUpdateSettings::GetChromeChannel does not read from the wrong section of registry when a per-user install has left some registrations behind. Fix the odd race and other bugs I encountered along the way. BUG=40994 TEST=Unittests in this change. Open about box and look at the channel string. Review URL: http://codereview.chromium.org/1582035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45043 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/google_update_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/installer/util/google_update_settings.h') diff --git a/chrome/installer/util/google_update_settings.h b/chrome/installer/util/google_update_settings.h index 3edfedf..70fbaf8 100644 --- a/chrome/installer/util/google_update_settings.h +++ b/chrome/installer/util/google_update_settings.h @@ -81,7 +81,7 @@ class GoogleUpdateSettings { // Return a human readable modifier for the version string, e.g. // the channel (dev, beta, stable). Returns true if this operation succeeded, // on success, channel contains one of "", "unknown", "dev" or "beta". - static bool GetChromeChannel(std::wstring* channel); + static bool GetChromeChannel(bool system_install, std::wstring* channel); private: DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings); -- cgit v1.1