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

Unified Diff: chrome/browser/upgrade_detector_impl.cc

Issue 2258263002: Consistently use namespaced base::Version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased against master. Created 4 years, 4 months 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/startup/default_browser_prompt.cc ('k') | chrome/common/chrome_content_client.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 a558d2a06620ec7521c8fdeeef1802f4c3e3e41e..4b7756595ac8ddb5f88d9f5124a595e3c69efc29 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -155,10 +155,10 @@ void DetectUpdatability(const base::Closure& callback_task,
// Gets the currently installed version. On Windows, if |critical_update| is not
// NULL, also retrieves the critical update version info if available.
-base::Version GetCurrentlyInstalledVersionImpl(Version* critical_update) {
+base::Version GetCurrentlyInstalledVersionImpl(base::Version* critical_update) {
base::ThreadRestrictions::AssertIOAllowed();
- Version installed_version;
+ base::Version installed_version;
#if defined(OS_WIN)
// Get the version of the currently *installed* instance of Chrome,
// which might be newer than the *running* instance if we have been
@@ -174,8 +174,8 @@ base::Version GetCurrentlyInstalledVersionImpl(Version* critical_update) {
critical_update);
}
#elif defined(OS_MACOSX)
- installed_version =
- Version(base::UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
+ installed_version = base::Version(
+ base::UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
#elif defined(OS_POSIX)
// POSIX but not Mac OS X: Linux, etc.
base::CommandLine command_line(*base::CommandLine::ForCurrentProcess());
@@ -187,7 +187,7 @@ base::Version GetCurrentlyInstalledVersionImpl(Version* critical_update) {
}
base::TrimWhitespaceASCII(reply, base::TRIM_ALL, &reply);
- installed_version = Version(reply);
+ installed_version = base::Version(reply);
#endif
return installed_version;
}
@@ -317,12 +317,12 @@ void UpgradeDetectorImpl::DetectUpgradeTask(
base::WeakPtr<UpgradeDetectorImpl> upgrade_detector) {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
- Version critical_update;
- Version installed_version =
+ base::Version critical_update;
+ base::Version installed_version =
GetCurrentlyInstalledVersionImpl(&critical_update);
// Get the version of the currently *running* instance of Chrome.
- Version running_version(version_info::GetVersionNumber());
+ base::Version running_version(version_info::GetVersionNumber());
if (!running_version.IsValid()) {
NOTREACHED();
return;
« no previous file with comments | « chrome/browser/ui/startup/default_browser_prompt.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698