summaryrefslogtreecommitdiffstats
path: root/base/sys_info_chromeos.cc
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 23:38:23 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 23:38:23 +0000
commit71b5a4460d0fc58cfcafb5aa7f41632d824a0b8b (patch)
tree4442115a8bd62bcc1576badf4c99f4a629ac481b /base/sys_info_chromeos.cc
parent7f29653c6e0b328f5f25047b1be69d4c2785e748 (diff)
downloadchromium_src-71b5a4460d0fc58cfcafb5aa7f41632d824a0b8b.zip
chromium_src-71b5a4460d0fc58cfcafb5aa7f41632d824a0b8b.tar.gz
chromium_src-71b5a4460d0fc58cfcafb5aa7f41632d824a0b8b.tar.bz2
Change Chrome OS version numbers to Platform versions.
Changed the version parsing for Chrome OS if a special function has been called to strip out the leading 0. and major version number. Additionally changed about chrome os, about chrome os -> more info, about:version and the login screen to reflect version numbers more in tune with a 'platform' than OS. BUG=chromium-os:15789 TEST=Viewed all the screens and took screenshots. Screen shots of all effected screens are attached to the cros bug Review URL: http://codereview.chromium.org/7108019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_chromeos.cc')
-rw-r--r--base/sys_info_chromeos.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
index cd17c18..f724f99 100644
--- a/base/sys_info_chromeos.cc
+++ b/base/sys_info_chromeos.cc
@@ -94,17 +94,20 @@ void SysInfo::ParseLsbRelease(const std::string& lsb_release,
size_t length = lsb_release.find_first_of('\n', start_index) - start_index;
std::string version = lsb_release.substr(start_index, length);
StringTokenizer tokenizer(version, ".");
- for (int i = 0; i < 3 && tokenizer.GetNext(); i++) {
- if (0 == i) {
+ // TODO(rkc): Ignore the 0. here; fix this once we move Chrome OS version
+ // numbers from the 0.xx.yyy.zz format to the xx.yyy.zz format.
+ // Refer to http://code.google.com/p/chromium-os/issues/detail?id=15789
+ for (int i = 0; i < 4 && tokenizer.GetNext(); i++) {
+ if (1 == i) {
StringToInt(tokenizer.token_begin(),
tokenizer.token_end(),
major_version);
*minor_version = *bugfix_version = 0;
- } else if (1 == i) {
+ } else if (2 == i) {
StringToInt(tokenizer.token_begin(),
tokenizer.token_end(),
minor_version);
- } else { // 2 == i
+ } else { // 3 == i
StringToInt(tokenizer.token_begin(),
tokenizer.token_end(),
bugfix_version);