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

Unified Diff: chrome/installer/util/installation_state.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/installation_state.cc
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
index a926435daf1adb68031c689877059f4be5ae5de6..cee44940f65de08c2ef411cacdaae408fd6001b4 100644
--- a/chrome/installer/util/installation_state.cc
+++ b/chrome/installer/util/installation_state.cc
@@ -65,7 +65,7 @@ bool ProductState::Initialize(bool system_install,
base::string16 version_str;
if (key.ReadValue(google_update::kRegVersionField,
&version_str) == ERROR_SUCCESS) {
- version_.reset(new Version(base::UTF16ToASCII(version_str)));
+ version_.reset(new base::Version(base::UTF16ToASCII(version_str)));
if (!version_->IsValid())
version_.reset();
}
@@ -75,7 +75,7 @@ bool ProductState::Initialize(bool system_install,
// only be accessible via InstallationState::GetNonVersionedProductState.
if (key.ReadValue(google_update::kRegOldVersionField,
&version_str) == ERROR_SUCCESS) {
- old_version_.reset(new Version(base::UTF16ToASCII(version_str)));
+ old_version_.reset(new base::Version(base::UTF16ToASCII(version_str)));
if (!old_version_->IsValid())
old_version_.reset();
}
@@ -151,16 +151,17 @@ base::FilePath ProductState::GetSetupPath() const {
return uninstall_command_.GetProgram();
}
-const Version& ProductState::version() const {
+const base::Version& ProductState::version() const {
DCHECK(version_.get() != NULL);
return *version_;
}
ProductState& ProductState::CopyFrom(const ProductState& other) {
channel_.set_value(other.channel_.value());
- version_.reset(other.version_.get() ? new Version(*other.version_) : NULL);
+ version_.reset(other.version_.get() ? new base::Version(*other.version_)
+ : NULL);
old_version_.reset(
- other.old_version_.get() ? new Version(*other.old_version_) : NULL);
+ other.old_version_.get() ? new base::Version(*other.old_version_) : NULL);
brand_ = other.brand_;
rename_cmd_ = other.rename_cmd_;
uninstall_command_ = other.uninstall_command_;
« no previous file with comments | « chrome/installer/util/installation_state.h ('k') | chrome/installer/util/installation_validator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698