Add ARC version to help and version pages

chromeos/system/version_loader.cc

 // 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.
 
 #include "chromeos/system/version_loader.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 11 matching lines @@
 
 namespace {
 
 // Beginning of line we look for that gives full version number.
 // Format: x.x.xx.x (Developer|Official build extra info) board info
 const char kFullVersionKey[] = "CHROMEOS_RELEASE_DESCRIPTION";
 
 // Same but for short version (x.x.xx.x).
 const char kVersionKey[] = "CHROMEOS_RELEASE_VERSION";
 
+// Same but for ARC version.
+const char kArcVersionKey[] = "CHROMEOS_ARC_VERSION";
+
 // Beginning of line we look for that gives the firmware version.
 const char kFirmwarePrefix[] = "version";
 
 // File to look for firmware number in.
 const char kPathFirmware[] = "/var/log/bios_info.txt";
 
 }  // namespace
 
 std::string GetVersion(VersionFormat format) {
   std::string version;
   std::string key = (format == VERSION_FULL ?
                      kFullVersionKey : kVersionKey);
   if (!base::SysInfo::GetLsbReleaseValue(key, &version)) {
     LOG_IF(ERROR, base::SysInfo::IsRunningOnChromeOS())
         << "No LSB version key: " << key;
     version = "0.0.0.0";
   }
   if (format == VERSION_SHORT_WITH_DATE) {
     base::Time::Exploded ctime;
     base::SysInfo::GetLsbReleaseTime().UTCExplode(&ctime);
     version += base::StringPrintf("-%02u.%02u.%02u",
                                   ctime.year % 100,
                                   ctime.month,
                                   ctime.day_of_month);
   }
 
   return version;
 }
 
+std::string GetARCVersion() {
+  std::string version;
+  if (!base::SysInfo::GetLsbReleaseValue(kArcVersionKey, &version)) {
+    LOG_IF(ERROR, base::SysInfo::IsRunningOnChromeOS())
+        << "No LSB version key: " << kArcVersionKey;
+    version = "";

[stevenjb, 2016/04/21 19:38:54]

nit: not strictly necessary, version will not be set if GetLsbReleaseValue()
returns false.

[elijahtaylor1, 2016/04/21 20:23:12]

Done.

+  }
+  return version;
+}
+
 std::string GetFirmware() {
   std::string firmware;
   std::string contents;
   const base::FilePath file_path(kPathFirmware);
   if (base::ReadFileToString(file_path, &contents)) {
     firmware = ParseFirmware(contents);
   }
   return firmware;
 }
 
@@ skipping 15 matching lines @@
       size_t found = str.find_first_not_of("| ");
       if (found != std::string::npos)
         return str.substr(found);
     }
   }
   return std::string();
 }
 
 }  // namespace version_loader
 }  // namespace chromeos