Add OS and firmware version to device status reports.

chrome/browser/policy/cloud_policy_data_store.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_CLOUD_POLICY_DATA_STORE_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_DATA_STORE_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/policy/device_status_collector.h"

[Joao da Silva, 2011/12/12 17:36:20]

Wrap this #include in #if defined(OS_CHROMEOS). Write that #if block after all
these #includes.

[Patrick Dubroy, 2011/12/13 10:33:51]

Done.

 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
 namespace policy {
 
 namespace em = enterprise_management;
 
 // Stores in memory all the data that is used in the cloud policy subsystem,
 // and manages notification about changes to these fields.
 // TODO(gfeher): The policy data stored in CloudPolicyCacheBase is currently
 // an exception, move that here.
@@ skipping 51 matching lines @@
                        const std::string& device_id,
                        const std::string& user_name,
                        const std::string& gaia_token,
                        bool token_cache_loaded);
 
   void set_device_id(const std::string& device_id);
   void set_machine_id(const std::string& machine_id);
   void set_machine_model(const std::string& machine_model);
   void set_user_name(const std::string& user_name);
   void set_user_affiliation(UserAffiliation user_affiliation);
+
+#if defined(OS_CHROMEOS)
   void set_device_status_collector(DeviceStatusCollector* collector);
+  DeviceStatusCollector* device_status_collector();
+#endif
 
   const std::string& device_id() const;
   const std::string& device_token() const;
   const std::string& gaia_token() const;
   const std::string& oauth_token() const;
   bool has_auth_token() const;
   const std::string& machine_id() const;
   const std::string& machine_model() const;
   em::DeviceRegisterRequest_Type policy_register_type() const;
   const std::string& policy_type() const;
   bool token_cache_loaded() const;
   const std::string& user_name() const;
   UserAffiliation user_affiliation() const;
-  DeviceStatusCollector* device_status_collector();
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   void NotifyCredentialsChanged();
   void NotifyDeviceTokenChanged();
 
  private:
   CloudPolicyDataStore(
       const em::DeviceRegisterRequest_Type policy_register_type,
@@ skipping 13 matching lines @@
   const em::DeviceRegisterRequest_Type policy_register_type_;
   const std::string policy_type_;
 
   // Data used for constructiong both register and policy requests.
   std::string device_id_;
   std::string machine_model_;
   std::string machine_id_;
 
   bool token_cache_loaded_;
 
+#if defined(OS_CHROMEOS)
   scoped_ptr<DeviceStatusCollector> device_status_collector_;
+#endif
 
   ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyDataStore);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_DATA_STORE_H_