diff options
Diffstat (limited to 'chrome/browser/google/google_update_win.cc')
| -rw-r--r-- | chrome/browser/google/google_update_win.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index 83fa005..bdb122d 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc @@ -34,18 +34,18 @@ namespace { // Returns GOOGLE_UPDATE_NO_ERROR only if the instance running is a Google // Chrome distribution installed in a standard location. GoogleUpdateErrorCode CanUpdateCurrentChrome( - const FilePath& chrome_exe_path) { + const base::FilePath& chrome_exe_path) { #if !defined(GOOGLE_CHROME_BUILD) return CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY; #else // TODO(tommi): Check if using the default distribution is always the right // thing to do. BrowserDistribution* dist = BrowserDistribution::GetDistribution(); - FilePath user_exe_path = installer::GetChromeInstallPath(false, dist); - FilePath machine_exe_path = installer::GetChromeInstallPath(true, dist); - if (!FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(), + base::FilePath user_exe_path = installer::GetChromeInstallPath(false, dist); + base::FilePath machine_exe_path = installer::GetChromeInstallPath(true, dist); + if (!base::FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(), user_exe_path.value()) && - !FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(), + !base::FilePath::CompareEqualIgnoreCase(chrome_exe_path.value(), machine_exe_path.value())) { LOG(ERROR) << L"Google Update cannot update Chrome installed in a " << L"non-standard location: " << chrome_exe_path.value().c_str() @@ -246,7 +246,7 @@ void GoogleUpdate::CheckForUpdate(bool install_if_newer, HWND window) { void GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, HWND window, MessageLoop* main_loop) { - FilePath chrome_exe; + base::FilePath chrome_exe; if (!PathService::Get(base::DIR_EXE, &chrome_exe)) NOTREACHED(); |