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

Unified Diff: chrome/browser/chromeos/version_loader.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 | « chrome/browser/chromeos/version_loader.h ('k') | chrome/browser/resources/options/about_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/version_loader.cc
diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc
index 17981ab8f4599c99b0f7c55d2c1e8438aa5f1888..45b0a60f5aeb369633da76f4fb61223648f1638a 100644
--- a/chrome/browser/chromeos/version_loader.cc
+++ b/chrome/browser/chromeos/version_loader.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -21,6 +21,10 @@ namespace chromeos {
// File to look for version number in.
static const char kPathVersion[] = "/etc/lsb-release";
+// TODO(rkc): Remove once we change over the Chrome OS version format.
+// Done for http://code.google.com/p/chromium-os/issues/detail?id=15789
+static const size_t kTrimVersion = 2;
+
// File to look for firmware number in.
static const char kPathFirmware[] = "/var/log/bios_info.txt";
@@ -78,6 +82,10 @@ VersionLoader::Handle VersionLoader::GetFirmware(
return request->handle();
}
+void VersionLoader::EnablePlatformVersions(bool enable) {
+ backend_.get()->set_parse_as_platform(enable);
+}
+
// static
std::string VersionLoader::ParseVersion(const std::string& contents,
const std::string& prefix) {
@@ -139,6 +147,20 @@ void VersionLoader::Backend::GetVersion(
version = ParseVersion(
contents,
(format == VERSION_FULL) ? kFullVersionPrefix : kVersionPrefix);
+
+ // TODO(rkc): Fix this once we move to xx.yyy version numbers for Chrome OS
+ // instead of 0.xx.yyy
+ // Done for http://code.google.com/p/chromium-os/issues/detail?id=15789
+ if (parse_as_platform_) {
+ if (version.size() > kTrimVersion) {
+ version = version.substr(kTrimVersion);
+ // Strip the major version.
+ size_t first_dot = version.find(".");
+ if (first_dot != std::string::npos) {
+ version = version.substr(first_dot + 1);
+ }
+ }
+ }
}
if (format == VERSION_SHORT_WITH_DATE) {
« no previous file with comments | « chrome/browser/chromeos/version_loader.h ('k') | chrome/browser/resources/options/about_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698