Fixed a TODO in data export of net-internals, added Chrome version and command line.

BUG=none
TEST=Go to about:net-internals click on dump to text, check if version and command line are good.

Patch contributed by malavv

Review URL: http://codereview.chromium.org/2104012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47926 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 3 deletions

diff --git a/chrome/browser/resources/net_internals/dataview.js b/chrome/browser/resources/net_internals/dataview.js
index 8032a11..fbbad7d 100644
--- a/chrome/browser/resources/net_internals/dataview.js
+++ b/chrome/browser/resources/net_internals/dataview.js
@@ -39,9 +39,12 @@ DataView.prototype.onExportToText_ = function() {
   text.push('Number of actively captured events: ' +
             g_browser.getAllActivelyCapturedEvents().length);
   text.push('');
-  // TODO(eroman): fill this with proper values.
-  text.push('Chrome version: ' + 'TODO');
-  text.push('Command line switches: ' + 'TODO');
+
+  text.push('Chrome version: ' + ClientInfo.version +
+            ' (' + ClientInfo.official +
+            ' ' + ClientInfo.cl +
+            ') ' + ClientInfo.version_mod);
+  text.push('Command line switches: ' + ClientInfo.command_line);
 
   text.push('');
   text.push('----------------------------------------------');
diff --git a/chrome/browser/resources/net_internals/main.js b/chrome/browser/resources/net_internals/main.js
index c5189d2..545608e 100644
--- a/chrome/browser/resources/net_internals/main.js
+++ b/chrome/browser/resources/net_internals/main.js
@@ -7,6 +7,7 @@
  */
 var LogEventType = null;
 var LogEventPhase = null;
+var ClientInfo = null;
 var LogSourceType = null;
 var NetError = null;
 var LoadFlag = null;
@@ -210,6 +211,11 @@ BrowserBridge.prototype.receivedLogEventTypeConstants = function(constantsMap) {
   LogEventType = constantsMap;
 };
 
+BrowserBridge.prototype.receivedClientInfo =
+function(info) {
+  ClientInfo = info;
+};
+
 BrowserBridge.prototype.receivedLogEventPhaseConstants =
 function(constantsMap) {
   LogEventPhase = constantsMap;