kiosk: Add status report for os update and running app

chrome/browser/chromeos/policy/device_status_collector.h

 // Copyright (c) 2012 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_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 160 matching lines @@
   void GetBootMode(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetLocation(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetNetworkInterfaces(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetUsers(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetHardwareStatus(
       enterprise_management::DeviceStatusReportRequest* request);
+  bool GetOsUpdateStatus(
+      enterprise_management::DeviceStatusReportRequest* request);
+  bool GetRunningKioskApp(
+      enterprise_management::DeviceStatusReportRequest* request);
 
   // Update the cached values of the reporting settings.
   void UpdateReportingSettings();
 
   void ScheduleGeolocationUpdateRequest();
 
   // content::GeolocationUpdateCallback implementation.
   void ReceiveGeolocationUpdate(const content::Geoposition&);
 
   // Callback invoked to update our cached disk information.
   void ReceiveVolumeInfo(
       const std::vector<enterprise_management::VolumeInfo>& info);
 
   // Callback invoked to update our cpu usage information.
   void ReceiveCPUStatistics(const std::string& statistics);
 
   // Callback invoked to update our CPU temp information.
   void StoreCPUTempInfo(
       const std::vector<enterprise_management::CPUTempInfo>& info);
 
   // Helper routine to convert from Shill-provided signal strength (percent)
   // to dBm units expected by server.
   int ConvertWifiSignalStrength(int signal_strength);
 
-  PrefService* local_state_;
+  PrefService* const local_state_;
 
   // The last time an idle state check was performed.
   base::Time last_idle_check_;
 
   // The maximum key that went into the last report generated by
   // GetDeviceStatus(), and the duration for it. This is used to trim the
   // stored data in OnSubmittedSuccessfully(). Trimming is delayed so
   // unsuccessful uploads don't result in dropped data.
-  int64_t last_reported_day_;
-  int duration_for_last_reported_day_;
+  int64_t last_reported_day_ = 0;
+  int duration_for_last_reported_day_ = 0;
 
   // Whether a geolocation update is currently in progress.
-  bool geolocation_update_in_progress_;
+  bool geolocation_update_in_progress_ = false;
 
   base::RepeatingTimer idle_poll_timer_;
   base::RepeatingTimer hardware_status_sampling_timer_;
   base::OneShotTimer geolocation_update_timer_;
 
   std::string os_version_;
   std::string firmware_version_;
 
   content::Geoposition position_;
 
@@ skipping 18 matching lines @@
 
   // Callback invoked to fetch information about the mounted disk volumes.
   VolumeInfoFetcher volume_info_fetcher_;
 
   // Callback invoked to fetch information about cpu usage.
   CPUStatisticsFetcher cpu_statistics_fetcher_;
 
   // Callback invoked to fetch information about cpu temperature.
   CPUTempFetcher cpu_temp_fetcher_;
 
-  chromeos::system::StatisticsProvider* statistics_provider_;
+  chromeos::system::StatisticsProvider* const statistics_provider_;
 
-  chromeos::CrosSettings* cros_settings_;
+  chromeos::CrosSettings* const cros_settings_;
 
   // The most recent CPU readings.
-  uint64_t last_cpu_active_;
-  uint64_t last_cpu_idle_;
+  uint64_t last_cpu_active_ = 0;
+  uint64_t last_cpu_idle_ = 0;
 
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   LocationUpdateRequester location_update_requester_;
 
   std::unique_ptr<content::GeolocationProvider::Subscription>
       geolocation_subscription_;
 
   // Cached values of the reporting settings from the device policy.
-  bool report_version_info_;
-  bool report_activity_times_;
-  bool report_boot_mode_;
-  bool report_location_;
-  bool report_network_interfaces_;
-  bool report_users_;
-  bool report_hardware_status_;
-  bool report_session_status_;
+  bool report_version_info_ = false;
+  bool report_activity_times_ = false;
+  bool report_boot_mode_ = false;
+  bool report_location_ = false;
+  bool report_network_interfaces_ = false;
+  bool report_users_ = false;
+  bool report_hardware_status_ = false;
+  bool report_session_status_ = false;
+  bool report_os_update_status_ = false;
+  bool report_running_kiosk_app_ = false;
 
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       version_info_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       activity_times_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       boot_mode_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       location_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       network_interfaces_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       users_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       hardware_status_subscription_;
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       session_status_subscription_;
+  std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
+      os_update_status_subscription_;
+  std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
+      running_kiosk_app_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_