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

Unified Diff: chrome/browser/upgrade_detector_impl.cc

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 06c3d9ff25b50d48e336ca16cd8124f19c3fa902..7742a47103db4517180b1f8cea0d57dd88b0f88d 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -151,10 +151,10 @@
// 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(base::Version* critical_update) {
+base::Version GetCurrentlyInstalledVersionImpl(Version* critical_update) {
base::ThreadRestrictions::AssertIOAllowed();
- base::Version installed_version;
+ 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
@@ -170,8 +170,8 @@
critical_update);
}
#elif defined(OS_MACOSX)
- installed_version = base::Version(
- base::UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
+ installed_version =
+ 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());
@@ -183,7 +183,7 @@
}
base::TrimWhitespaceASCII(reply, base::TRIM_ALL, &reply);
- installed_version = base::Version(reply);
+ installed_version = Version(reply);
#endif
return installed_version;
}
@@ -313,12 +313,12 @@
base::WeakPtr<UpgradeDetectorImpl> upgrade_detector) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- base::Version critical_update;
- base::Version installed_version =
+ Version critical_update;
+ Version installed_version =
GetCurrentlyInstalledVersionImpl(&critical_update);
// Get the version of the currently *running* instance of Chrome.
- base::Version running_version(version_info::GetVersionNumber());
+ 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