summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-25 22:32:09 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-25 22:32:09 +0000
commit215a5f9df082885e24f1a44a47168bcb8b4a364a (patch)
tree9d3c046680dd0b494c00511274320d4b8daa491b
parent3870f9a93a98d901983a00e2409a5654e2814d26 (diff)
downloadchromium_src-215a5f9df082885e24f1a44a47168bcb8b4a364a.zip
chromium_src-215a5f9df082885e24f1a44a47168bcb8b4a364a.tar.gz
chromium_src-215a5f9df082885e24f1a44a47168bcb8b4a364a.tar.bz2
Merge 225081 "Send Chrome version with ChromeOS also."
> Send Chrome version with ChromeOS also. > > R=zork@chromium.org > BUG=290395 > > Review URL: https://codereview.chromium.org/24458002 TBR=rkc@chromium.org Review URL: https://codereview.chromium.org/24692002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@225272 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc
index f368097..98759b1 100644
--- a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc
@@ -12,13 +12,19 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sync/about_sync_util.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
#include "content/public/browser/browser_thread.h"
+namespace {
+
const char kSyncDataKey[] = "about_sync_data";
const char kExtensionsListKey[] = "extensions";
+const char kChromeVersionTag[] = "CHROME VERSION";
+
+} // namespace
namespace chromeos {
@@ -27,6 +33,10 @@ void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
DCHECK(!callback.is_null());
SystemLogsResponse response;
+
+ chrome::VersionInfo version_info;
+ response[kChromeVersionTag] = version_info.CreateVersionString();
+
PopulateSyncLogs(&response);
PopulateExtensionInfoLogs(&response);