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

Unified Diff: chrome/installer/util/install_util.cc

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes 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
Index: chrome/installer/util/install_util.cc
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index f3998752ececaf883545ec5ba1fd0aa3f07286e3..b5fdddf9c72f6263b65a3f6ba950a1e83bdc3982 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -230,7 +230,7 @@ base::CommandLine InstallUtil::GetChromeUninstallCmd(
void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
bool system_install,
- Version* version) {
+ base::Version* version) {
DCHECK(dist);
RegKey key;
HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -242,11 +242,11 @@ void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
if (result == ERROR_SUCCESS)
result = key.ReadValue(google_update::kRegVersionField, &version_str);
- *version = Version();
+ *version = base::Version();
if (result == ERROR_SUCCESS && !version_str.empty()) {
VLOG(1) << "Existing " << dist->GetDisplayName() << " version found "
<< version_str;
- *version = Version(base::UTF16ToASCII(version_str));
+ *version = base::Version(base::UTF16ToASCII(version_str));
} else {
DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
VLOG(1) << "No existing " << dist->GetDisplayName()
@@ -256,7 +256,7 @@ void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
void InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
bool system_install,
- Version* version) {
+ base::Version* version) {
DCHECK(dist);
RegKey key;
HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -269,11 +269,11 @@ void InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
result = key.ReadValue(google_update::kRegCriticalVersionField,
&version_str);
- *version = Version();
+ *version = base::Version();
if (result == ERROR_SUCCESS && !version_str.empty()) {
VLOG(1) << "Critical Update version for " << dist->GetDisplayName()
<< " found " << version_str;
- *version = Version(base::UTF16ToASCII(version_str));
+ *version = base::Version(base::UTF16ToASCII(version_str));
} else {
DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
VLOG(1) << "No existing " << dist->GetDisplayName()
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | chrome/installer/util/installation_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698