Chromium Code Reviews| Index: chrome/browser/policy/device_management_backend_impl.cc |
| diff --git a/chrome/browser/policy/device_management_backend_impl.cc b/chrome/browser/policy/device_management_backend_impl.cc |
| index 5143b21c8cecaf51d30217b743d32121eb3ab7ee..274fff4178940f177fb96694bdfefb6534447969 100644 |
| --- a/chrome/browser/policy/device_management_backend_impl.cc |
| +++ b/chrome/browser/policy/device_management_backend_impl.cc |
| @@ -405,6 +405,7 @@ class DeviceManagementPolicyJob : public DeviceManagementJobBase { |
| const std::string& device_id, |
| const std::string& user_affiliation, |
| const em::DevicePolicyRequest& request, |
| + const em::DeviceStatusReportRequest* device_status, |
| DeviceManagementBackend::DevicePolicyResponseDelegate* delegate) |
| : DeviceManagementJobBase( |
| backend_impl, |
| @@ -416,6 +417,8 @@ class DeviceManagementPolicyJob : public DeviceManagementJobBase { |
| user_affiliation); |
| em::DeviceManagementRequest request_wrapper; |
| request_wrapper.mutable_policy_request()->CopyFrom(request); |
| + request_wrapper.mutable_device_status_report_request()->CopyFrom( |
|
Mattias Nissler (ping if slow)
2011/12/06 15:20:18
You should check whether device_status is NULL her
Patrick Dubroy
2011/12/06 16:41:57
Whoops :-) Done.
|
| + *device_status); |
| SetPayload(request_wrapper); |
| } |
| virtual ~DeviceManagementPolicyJob() {} |
| @@ -563,12 +566,13 @@ void DeviceManagementBackendImpl::ProcessPolicyRequest( |
| const std::string& device_id, |
| CloudPolicyDataStore::UserAffiliation affiliation, |
| const em::DevicePolicyRequest& request, |
| + const em::DeviceStatusReportRequest* device_status, |
| DevicePolicyResponseDelegate* delegate) { |
| UMA_HISTOGRAM_ENUMERATION(kMetricPolicy, kMetricPolicyFetchRequested, |
| kMetricPolicySize); |
| AddJob(new DeviceManagementPolicyJob(this, device_management_token, device_id, |
| UserAffiliationToString(affiliation), |
| - request, delegate)); |
| + request, device_status, delegate)); |
| } |
| // static |