From bf94d1a4cee4be0648778022f27100f8a074e34a Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Fri, 17 Dec 2010 00:09:50 +0000 Subject: base/version: remove wstring version And fix callers. BUG=23581 TEST=trybots Review URL: http://codereview.chromium.org/5848005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69490 0039d316-1c4b-4281-b951-d872f2087c98 --- base/version.cc | 7 ------- base/version.h | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'base') diff --git a/base/version.cc b/base/version.cc index fe224eb..c25b293 100644 --- a/base/version.cc +++ b/base/version.cc @@ -11,13 +11,6 @@ #include "base/utf_string_conversions.h" // static -Version* Version::GetVersionFromString(const std::wstring& version_str) { - if (!IsStringASCII(version_str)) - return NULL; - return GetVersionFromString(WideToUTF8(version_str)); -} - -// static Version* Version::GetVersionFromString(const std::string& version_str) { Version* vers = new Version(); if (vers->InitFromString(version_str)) { diff --git a/base/version.h b/base/version.h index 2b182bb..33f4af5 100644 --- a/base/version.h +++ b/base/version.h @@ -12,12 +12,14 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" +// Version represents a dotted version number, like "1.2.3.4", supporting +// parsing and comparison. +// Each component is limited to a uint16. class Version { public: // The version string must be made up of 1 or more uint16's separated // by '.'. Returns NULL if string is not in this format. // Caller is responsible for freeing the Version object once done. - static Version* GetVersionFromString(const std::wstring& version_str); static Version* GetVersionFromString(const std::string& version_str); // Exposed only so that a Version can be stored in STL containers; -- cgit v1.1