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

Unified Diff: base/sys_info_chromeos.cc

Issue 7108019: Change Chrome OS version numbers to Platform versions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated header for 2011 Created 9 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 | « no previous file | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/sys_info_chromeos.cc
diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
index cd17c18cc96a7e7317ddfc9ac16ed67dcff3447c..f724f993df8a21b5fc90a15acc74ac40efd2ffd4 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);
« no previous file with comments | « no previous file | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698