From 0682087b250d84db513a45b47344cbbcbf541b8b Mon Sep 17 00:00:00 2001 From: "hbono@chromium.org" Date: Wed, 1 Dec 2010 08:40:42 +0000 Subject: A build fix for our official bot. This just adds a pointer to BrowserDistribution as the second parameter for installer::GetChromeInstallPath() to fix the build breaks on the "Google Chrome Win" bot. TBR=tommi BUG=none TEST=make the "Google Chrome Win" bot green. Review URL: http://codereview.chromium.org/5442001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67830 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/google/google_update.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chrome/browser/google') diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index c373b59..ca8e9bf 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -33,8 +33,11 @@ bool CanUpdateCurrentChrome(const std::wstring& chrome_exe_path) { #if !defined(GOOGLE_CHROME_BUILD) return false; #else - std::wstring user_exe_path = installer::GetChromeInstallPath(false); - std::wstring machine_exe_path = installer::GetChromeInstallPath(true); + // TODO(tommi): Check if using the default distribution is always the right + // thing to do. + BrowserDistribution* dist = BrowserDistribution::GetDistribution() + std::wstring user_exe_path = installer::GetChromeInstallPath(false, dist); + std::wstring machine_exe_path = installer::GetChromeInstallPath(true, dist); std::transform(user_exe_path.begin(), user_exe_path.end(), user_exe_path.begin(), tolower); std::transform(machine_exe_path.begin(), machine_exe_path.end(), -- cgit v1.1