diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 10:24:55 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 10:24:55 +0000 |
| commit | b790acfebbf9b6f8c59974d2e52ec86257409492 (patch) | |
| tree | 81a6dd4036a3681ef86df8823d63377d04ffcbec /chrome/browser/google | |
| parent | ea51f1fce57f4f786ad0f54858c626dfd205f8f0 (diff) | |
| download | chromium_src-b790acfebbf9b6f8c59974d2e52ec86257409492.zip chromium_src-b790acfebbf9b6f8c59974d2e52ec86257409492.tar.gz chromium_src-b790acfebbf9b6f8c59974d2e52ec86257409492.tar.bz2 | |
Build fix for the "Google Chrome Win" bot (take 3)
This change just adds value() to convert from FilePath to std::wstring. (I have verified this works good in my Windows PC.)
TBR=tommi
BUG=none
TEST=fix build in the "Google Chrome Win" bot.
Review URL: http://codereview.chromium.org/5446001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google')
| -rw-r--r-- | chrome/browser/google/google_update.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index f9add94..fc7f324 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -36,8 +36,10 @@ bool CanUpdateCurrentChrome(const std::wstring& chrome_exe_path) { // 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::wstring user_exe_path = + installer::GetChromeInstallPath(false, dist).value(); + std::wstring machine_exe_path = + installer::GetChromeInstallPath(true, dist).value(); 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(), |