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

Unified Diff: chrome/common/extensions/extension.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 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/upgrade_detector_impl.cc ('k') | chrome/common/extensions/update_manifest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 0f13369b7597cab95baabdd99c315bbea8bfe9d0..77e3414aa2ba860128feb54039f55864570e2c61 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -980,9 +980,8 @@ bool Extension::CheckMinimumChromeVersion(string16* error) {
return false;
}
- scoped_ptr<Version> minimum_version(
- Version::GetVersionFromString(minimum_version_string));
- if (!minimum_version.get()) {
+ Version minimum_version(minimum_version_string);
+ if (!minimum_version.IsValid()) {
*error = ASCIIToUTF16(errors::kInvalidMinimumChromeVersion);
return false;
}
@@ -993,14 +992,13 @@ bool Extension::CheckMinimumChromeVersion(string16* error) {
return false;
}
- scoped_ptr<Version> current_version(
- Version::GetVersionFromString(current_version_info.Version()));
- if (!current_version.get()) {
+ Version current_version(current_version_info.Version());
+ if (!current_version.IsValid()) {
DCHECK(false);
return false;
}
- if (current_version->CompareTo(*minimum_version) < 0) {
+ if (current_version.CompareTo(minimum_version) < 0) {
*error = ExtensionErrorUtils::FormatErrorMessageUTF16(
errors::kChromeVersionTooLow,
l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
@@ -1339,8 +1337,8 @@ bool Extension::LoadVersion(string16* error) {
*error = ASCIIToUTF16(errors::kInvalidVersion);
return false;
}
- version_.reset(Version::GetVersionFromString(version_str));
- if (!version_.get() ||
+ version_.reset(new Version(version_str));
+ if (!version_->IsValid() ||
version_->components().size() > 4) {
*error = ASCIIToUTF16(errors::kInvalidVersion);
return false;
« no previous file with comments | « chrome/browser/upgrade_detector_impl.cc ('k') | chrome/common/extensions/update_manifest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698