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

chrome/browser/dom_ui/net_internals_ui.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/dom_ui/net_internals_ui.h"
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
 
+#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/app/chrome_version_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/connection_tester.h"
 #include "chrome/browser/net/passive_log_collector.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/url_constants.h"
+#include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/host_resolver_impl.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 
@@ skipping 448 matching lines @@
 
     for (size_t i = 0; i < event_types.size(); ++i) {
       const char* name = net::NetLog::EventTypeToString(event_types[i]);
       dict->SetInteger(ASCIIToWide(name),
                        static_cast<int>(event_types[i]));
     }
 
     CallJavascriptFunction(L"g_browser.receivedLogEventTypeConstants", dict);
   }
 
+  // Tell the javascript about the version of the client and its
+  // command line arguments.
+  {
+    DictionaryValue* dict = new DictionaryValue();
+
+    scoped_ptr<FileVersionInfo> version_info(
+        chrome_app::GetChromeVersionInfo());
+
+    if (version_info == NULL) {
+      DLOG(ERROR) << "Unable to create FileVersionInfo object";
+
+    } else {
+      // We have everything we need to send the right values.
+      dict->SetString(L"version", version_info->file_version());
+      dict->SetString(L"cl", version_info->last_change());
+      dict->SetStringFromUTF16(L"version_mod",
+          platform_util::GetVersionStringModifier());
+
+      if (version_info->is_official_build()) {
+        dict->SetString(L"official",
+            l10n_util::GetString(IDS_ABOUT_VERSION_OFFICIAL));
+      } else {
+        dict->SetString(L"official",
+            l10n_util::GetString(IDS_ABOUT_VERSION_UNOFFICIAL));
+      }
+
+      dict->SetString(L"command_line",
+          CommandLine::ForCurrentProcess()->command_line_string());
+    }
+
+    CallJavascriptFunction(L"g_browser.receivedClientInfo",
+                           dict);
+  }
+
   // Tell the javascript about the relationship between load flag enums and
   // their symbolic name.
   {
     DictionaryValue* dict = new DictionaryValue();
 
 #define LOAD_FLAG(label, value) \
     dict->SetInteger(ASCIIToWide(# label), static_cast<int>(value));
 #include "net/base/load_flags_list.h"
 #undef LOAD_FLAG
 
@@ skipping 363 matching lines @@
   NetInternalsHTMLSource* html_source = new NetInternalsHTMLSource();
 
   // Set up the chrome://net-internals/ source.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
           Singleton<ChromeURLDataManager>::get(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }