summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/policy/device_status_collector.cc5
-rw-r--r--chrome/browser/policy/proto/device_management_backend.proto5
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc
index 7b23d98..44722a2 100644
--- a/chrome/browser/policy/device_status_collector.cc
+++ b/chrome/browser/policy/device_status_collector.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -10,6 +10,7 @@
#include "chrome/browser/policy/proto/device_management_backend.pb.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/common/chrome_version_info.h"
using base::Time;
using base::TimeDelta;
@@ -154,6 +155,8 @@ void DeviceStatusCollector::GetStatus(em::DeviceStatusReportRequest* request) {
ListPrefUpdate update(local_state_, kPrefDeviceActivePeriods);
update.Get()->Clear();
+ chrome::VersionInfo version_info;
+ request->set_browser_version(version_info.Version());
request->set_os_version(os_version_);
request->set_firmware_version(firmware_version_);
}
diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
index 6f4f6d4..2224111 100644
--- a/chrome/browser/policy/proto/device_management_backend.proto
+++ b/chrome/browser/policy/proto/device_management_backend.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -250,6 +250,9 @@ message DeviceStatusReportRequest {
// Device active times collection since last report rpc call.
repeated TimePeriod active_time = 4;
+
+ // The browser version string as shown in the About dialog.
+ optional string browser_version = 5;
}
// Report session (a user on one device) level status.