diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 21:27:12 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 21:27:12 +0000 |
| commit | 36ee0327a9acf37dd445918029015994d88fb6f0 (patch) | |
| tree | 9435eaab619b17324177bfd6f9e4021809b3cad1 /base | |
| parent | 8d4c4bb33c199a0295d63a3ebfb7443c69d1f78c (diff) | |
| download | chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.zip chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.tar.gz chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.tar.bz2 | |
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@70098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/version.cc | 7 | ||||
| -rw-r--r-- | base/version.h | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/base/version.cc b/base/version.cc index 6ad0cbe..384be0a 100644 --- a/base/version.cc +++ b/base/version.cc @@ -13,13 +13,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 f034c03..2fda4ad 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; |