From 3de7303605493aaedaec6d8b301b11d04ec2e39b Mon Sep 17 00:00:00 2001 From: "dubroy@chromium.org" Date: Thu, 19 Jan 2012 10:26:12 +0000 Subject: Add browser version to device status reports. patch from issue 7548001 BUG=22035 TEST=Confirm on the server side that the correct value is being received. Review URL: http://codereview.chromium.org/9243007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118280 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/policy/device_status_collector.cc | 5 ++++- chrome/browser/policy/proto/device_management_backend.proto | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'chrome') 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. -- cgit v1.1