Aggregate device activity, and report per-day activity in device status reports.

chrome/browser/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_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #pragma once
 
 #include "base/time.h"
 #include "base/timer.h"
@@ skipping 33 matching lines @@
  protected:
   // Check whether the user has been idle for a certain period of time.
   virtual void CheckIdleState();
 
   // Used instead of base::Time::Now(), to make testing possible.
   virtual base::Time GetCurrentTime();
 
   // 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_;
+  // The number of days in the past to store device activity.
+  // This is kept in case device status uploads fail for a number of days.
+  unsigned int max_stored_past_activity_days_;
+
+  // The number of days in the future to store device activity.
+  // When changing the system time and/or timezones, it's possible to record
+  // activity time that is slightly in the future.
+  unsigned int max_stored_future_activity_days_;
 
  private:
+  // Cleans up the locally stored activity periods if there are too many.

[Mattias Nissler (ping if slow), 2012/02/15 14:56:21]

s/if there are too many/that fall outside of the activity collection window/ or
something alike.

[Patrick Dubroy, 2012/02/15 15:37:25]

Done.

+  void PruneStoredActivityPeriods(base::Time base_time);
+
   void AddActivePeriod(base::Time start, base::Time end);
 
   // Callbacks from chromeos::VersionLoader.
   void OnOSVersion(chromeos::VersionLoader::Handle handle,
                    std::string version);
   void OnOSFirmware(chromeos::VersionLoader::Handle handle,
                     std::string version);
 
   // Helpers for the various portions of the status.
   void GetActivityTimes(
@@ skipping 13 matching lines @@
       const content::NotificationDetails& details) OVERRIDE;
 
   // 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.
   base::Time last_idle_check_;
 
-  // The idle state the last time it was checked.
-  IdleState last_idle_state_;
-
   base::RepeatingTimer<DeviceStatusCollector> timer_;
 
   chromeos::VersionLoader version_loader_;
   CancelableRequestConsumer consumer_;
 
   std::string os_version_;
   std::string firmware_version_;
 
   chromeos::system::StatisticsProvider* statistics_provider_;
 
   chromeos::CrosSettings* cros_settings_;
 
   // Cached values of the reporting settings from the device policy.
   bool report_version_info_;
   bool report_activity_times_;
   bool report_boot_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_