Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: chrome/browser/upgrade_detector_impl.cc

Issue 100543005: Update all users of base::Version to explicitly specify the namespace, and clean up the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: someday it will work Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/help/version_updater_win.cc ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/upgrade_detector_impl.cc
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 74a13882ea23d79cb9fba42bf192e4160be394f3..620acffd7538ed826ca04abd5eb5e92e8058ae9f 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -218,8 +218,8 @@ void UpgradeDetectorImpl::DetectUpgradeTask(
base::WeakPtr<UpgradeDetectorImpl> upgrade_detector) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- Version installed_version;
- Version critical_update;
+ base::Version installed_version;
+ base::Version critical_update;
#if defined(OS_WIN)
// Get the version of the currently *installed* instance of Chrome,
@@ -238,7 +238,7 @@ void UpgradeDetectorImpl::DetectUpgradeTask(
}
#elif defined(OS_MACOSX)
installed_version =
- Version(UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
+ base::Version(UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
#elif defined(OS_POSIX)
// POSIX but not Mac OS X: Linux, etc.
CommandLine command_line(*CommandLine::ForCurrentProcess());
@@ -249,7 +249,7 @@ void UpgradeDetectorImpl::DetectUpgradeTask(
return;
}
- installed_version = Version(reply);
+ installed_version = base::Version(reply);
#endif
// Get the version of the currently *running* instance of Chrome.
@@ -258,7 +258,7 @@ void UpgradeDetectorImpl::DetectUpgradeTask(
NOTREACHED() << "Failed to get current file version";
return;
}
- Version running_version(version_info.Version());
+ base::Version running_version(version_info.Version());
if (!running_version.IsValid()) {
NOTREACHED();
return;
« no previous file with comments | « chrome/browser/ui/webui/help/version_updater_win.cc ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698