| Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
|
| index a83054291f5838ee955786a56a9064d220072c1c..f31935a699ddf3aac76c40d7ee98ac45f45abbb6 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
|
| @@ -37,6 +37,7 @@ class DeviceCloudPolicyStoreChromeOS;
|
| class EnterpriseInstallAttributes;
|
| class HeartbeatScheduler;
|
| class StatusUploader;
|
| +class SystemLogUploader;
|
|
|
| // CloudPolicyManager specialization for device policy on Chrome OS.
|
| class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
|
| @@ -122,6 +123,9 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
|
| // Factory function to create the StatusUploader.
|
| void CreateStatusUploader();
|
|
|
| + // Factory function to create the SystemLogUploader.
|
| + void CreateSystemLogUploader();
|
| +
|
| // Points to the same object as the base CloudPolicyManager::store(), but with
|
| // actual device policy specific type.
|
| scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_store_;
|
| @@ -131,11 +135,14 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
|
| // state.
|
| scoped_ptr<StatusUploader> status_uploader_;
|
|
|
| + // Helper object that handles uploading system logs to the server.
|
| + scoped_ptr<SystemLogUploader> syslog_uploader_;
|
| +
|
| // Helper object that handles sending heartbeats over the GCM channel to
|
| // the server, to monitor connectivity.
|
| scoped_ptr<HeartbeatScheduler> heartbeat_scheduler_;
|
|
|
| - // The TaskRunner used to do device status uploads.
|
| + // The TaskRunner used to do device status and log uploads.
|
| scoped_refptr<base::SequencedTaskRunner> task_runner_;
|
|
|
| ServerBackedStateKeysBroker::Subscription state_keys_update_subscription_;
|
|
|