diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 23:56:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 23:56:18 +0000 |
| commit | b969648e443de8c767d7e2f6b34861b4a1ee3eec (patch) | |
| tree | b41dea85b620d7664038e2583614745bc4be6fae /chrome/browser/google | |
| parent | f0a94b593178cfe95dd16424cca6a0144de0d440 (diff) | |
| download | chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.zip chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.tar.gz chromium_src-b969648e443de8c767d7e2f6b34861b4a1ee3eec.tar.bz2 | |
windows: remove PathService::Get() that uses wstrings
This just required fixing the remaining callers.
BUG=24672
Review URL: http://codereview.chromium.org/5356008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google')
| -rw-r--r-- | chrome/browser/google/google_update.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index cb68832..c373b59 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -7,6 +7,7 @@ #include <atlbase.h> #include <atlcom.h> +#include "base/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_comptr_win.h" @@ -226,16 +227,17 @@ bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, Window* window, MessageLoop* main_loop) { - std::wstring chrome_exe_path; + FilePath chrome_exe_path; if (!PathService::Get(base::DIR_EXE, &chrome_exe_path)) { NOTREACHED(); return false; } + std::wstring chrome_exe = chrome_exe_path.value(); - std::transform(chrome_exe_path.begin(), chrome_exe_path.end(), - chrome_exe_path.begin(), tolower); + std::transform(chrome_exe.begin(), chrome_exe.end(), + chrome_exe.begin(), tolower); - if (!CanUpdateCurrentChrome(chrome_exe_path)) { + if (!CanUpdateCurrentChrome(chrome_exe)) { main_loop->PostTask(FROM_HERE, NewRunnableMethod(this, &GoogleUpdate::ReportResults, UPGRADE_ERROR, CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY)); @@ -254,7 +256,7 @@ bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, ScopedComPtr<IGoogleUpdate> on_demand; - if (InstallUtil::IsPerUserInstall(chrome_exe_path.c_str())) { + if (InstallUtil::IsPerUserInstall(chrome_exe.c_str())) { hr = on_demand.CreateInstance(CLSID_OnDemandUserAppsClass); } else { // The Update operation needs Admin privileges for writing |