Add OS and firmware version to device status reports.

chrome/browser/policy/device_status_collector.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #pragma once
 
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/idle.h"
 
 using base::Time;
+using chromeos::VersionLoader;

[Joao da Silva, 2011/12/12 14:23:04]

Nit: I'd avoid this, but it's your call. I'd rather have these on the .cc file
only; otherwise whoever includes this header will have these names in the global
namespace.

[Patrick Dubroy, 2011/12/12 15:18:01]

Done.

 
 namespace enterprise_management {
 class DeviceStatusReportRequest;
 }
 
 class PrefService;
 
 namespace policy {
 
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
@@ skipping 18 matching lines @@
 
   // Callback which receives the results of the idle state check.
   void IdleStateCallback(IdleState state);
 
   // The maximum number of active periods timestamps to be stored.
   unsigned int max_stored_active_periods_;
 
  private:
   void AddActivePeriod(base::Time start, base::Time end);
 
+  // Callbacks from chromeos::VersionLoader.
+  void OnOSVersion(VersionLoader::Handle handle,
+                   std::string version);
+  void OnOSFirmware(VersionLoader::Handle handle,
+                    std::string version);
+
   // How often to poll to see if the user is idle.
   int poll_interval_seconds_;
 
   PrefService* local_state_;
 
   // The last time an idle state check was performed.
   Time last_idle_check_;
 
   // The idle state the last time it was checked.
   IdleState last_idle_state_;
 
   base::RepeatingTimer<DeviceStatusCollector> timer_;
 
+  VersionLoader version_loader_;
+  CancelableRequestConsumer consumer_;
+
+  std::string os_version_;
+  std::string firmware_version_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_