diff options
Diffstat (limited to 'chrome/browser/upgrade_detector.cc')
| -rw-r--r-- | chrome/browser/upgrade_detector.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index a8928f1..7f3161d 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -30,7 +30,7 @@ #include "chrome/browser/ui/cocoa/keystone_glue.h" #elif defined(OS_POSIX) #include "base/process_util.h" -#include "chrome/installer/util/version.h" +#include "base/version.h" #endif namespace { @@ -80,7 +80,6 @@ class DetectUpgradeTask : public Task { virtual void Run() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); - using installer::Version; scoped_ptr<Version> installed_version; #if defined(OS_WIN) @@ -97,8 +96,8 @@ class DetectUpgradeTask : public Task { } #elif defined(OS_MACOSX) installed_version.reset( - Version::GetVersionFromString( - keystone_glue::CurrentlyInstalledVersion())); + Version::GetVersionFromString(UTF16ToWideHack( + keystone_glue::CurrentlyInstalledVersion()))); #elif defined(OS_POSIX) // POSIX but not Mac OS X: Linux, etc. CommandLine command_line(*CommandLine::ForCurrentProcess()); @@ -109,7 +108,7 @@ class DetectUpgradeTask : public Task { return; } - installed_version.reset(Version::GetVersionFromString(ASCIIToUTF16(reply))); + installed_version.reset(Version::GetVersionFromString(reply)); #endif // Get the version of the currently *running* instance of Chrome. @@ -119,7 +118,7 @@ class DetectUpgradeTask : public Task { return; } scoped_ptr<Version> running_version( - Version::GetVersionFromString(ASCIIToUTF16(version_info.Version()))); + Version::GetVersionFromString(version_info.Version())); if (running_version.get() == NULL) { NOTREACHED() << "Failed to parse version info"; return; @@ -129,7 +128,7 @@ class DetectUpgradeTask : public Task { // switching from dev to beta channel, for example). The user needs a // restart in this case as well. See http://crbug.com/46547 if (!installed_version.get() || - installed_version->IsHigherThan(running_version.get())) { + (installed_version->CompareTo(*running_version) > 0)) { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, upgrade_detected_task_); upgrade_detected_task_ = NULL; |