Index: chrome/browser/chromeos/version_loader.cc |
diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc |
index c0028e3962d0a4b73a8c316efdf7e5060aa22312..802373973d378c409ea3939d2f4cf74b1d06d6eb 100644 |
--- a/chrome/browser/chromeos/version_loader.cc |
+++ b/chrome/browser/chromeos/version_loader.cc |
@@ -22,10 +22,6 @@ 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"; |
@@ -83,10 +79,6 @@ 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) { |
@@ -148,20 +140,6 @@ 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) { |