Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: chrome/browser/policy/device_management_backend_impl.cc

Issue 8702009: Add device status reports to policy requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Mattias' comments and added unit test. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..10aee613124fd82088c850d29032cc9795b30bf8 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(
+ 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

Powered by Google App Engine
This is Rietveld 408576698