Adds the ability to load JSON log files to about:net-internals.

chrome/browser/resources/net_internals/dataview.js

 // 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.
 
 /**
  * This view displays options for importing/exporting the captured data. Its
  * primarily usefulness is to allow users to copy-paste their data in an easy
  * to read format for bug reports.
  *
  *   - Has a button to generate a text report.
  *
  *   - Shows how many events have been captured.
  *  @constructor
  */
 function DataView(mainBoxId,
                   outputTextBoxId,
                   exportTextButtonId,
                   securityStrippingCheckboxId,
                   byteLoggingCheckboxId,
                   passivelyCapturedCountId,
                   activelyCapturedCountId,
-                  deleteAllId) {
+                  deleteAllId,
+                  dumpDataDivId,
+                  loadDataDivId,
+                  loadLogFileId,
+                  capturingTextSpanId,
+                  loggingTextSpanId) {
   DivView.call(this, mainBoxId);
 
   this.textPre_ = document.getElementById(outputTextBoxId);
   this.securityStrippingCheckbox_ =
       document.getElementById(securityStrippingCheckboxId);
 
   var byteLoggingCheckbox = document.getElementById(byteLoggingCheckboxId);
   byteLoggingCheckbox.onclick =
       this.onSetByteLogging_.bind(this, byteLoggingCheckbox);
 
   var exportTextButton = document.getElementById(exportTextButtonId);
   exportTextButton.onclick = this.onExportToText_.bind(this);
 
   this.activelyCapturedCountBox_ =
       document.getElementById(activelyCapturedCountId);
   this.passivelyCapturedCountBox_ =
       document.getElementById(passivelyCapturedCountId);
   document.getElementById(deleteAllId).onclick =
       g_browser.deleteAllEvents.bind(g_browser);
 
+  this.dumpDataDiv_ = document.getElementById(dumpDataDivId);
+  this.loadDataDiv_ = document.getElementById(loadDataDivId);
+  this.capturingTextSpan_ = document.getElementById(capturingTextSpanId);
+  this.loggingTextSpan_ = document.getElementById(loggingTextSpanId);
+
+  document.getElementById(loadLogFileId).onclick =
+      g_browser.loadLogFile.bind(g_browser);
+
   this.updateEventCounts_();
   this.waitingForUpdate_ = false;
 
   g_browser.addLogObserver(this);
 }
 
 inherits(DataView, DivView);
 
 /**
  * Called whenever a new event is received.
@@ skipping 11 matching lines @@
 };
 
 /**
  * Called whenever all log events are deleted.
  */
 DataView.prototype.onAllLogEntriesDeleted = function() {
   this.updateEventCounts_();
 };
 
 /**
+ * Called when either a log file is loaded or when going back to actively
+ * logging events.  In either case, called after clearing the old entries,
+ * but before getting any new ones.
+ */
+DataView.prototype.onSetIsViewingLogFile = function(isViewingLogFile) {
+  setNodeDisplay(this.dumpDataDiv_, !isViewingLogFile);
+  setNodeDisplay(this.capturingTextSpan_, !isViewingLogFile);
+  setNodeDisplay(this.loggingTextSpan_, isViewingLogFile);
+  this.setText_('');
+};
+
+/**
  * Updates the counters showing how many events have been captured.
  */
 DataView.prototype.updateEventCounts_ = function() {
   this.activelyCapturedCountBox_.innerText =
       g_browser.getNumActivelyCapturedEvents()
   this.passivelyCapturedCountBox_.innerText =
       g_browser.getNumPassivelyCapturedEvents();
 };
 
 /**
@@ skipping 17 matching lines @@
     return;
   this.waitingForUpdate = true;
   this.setText_('Generating...');
   g_browser.updateAllInfo(this.onUpdateAllCompleted.bind(this));
 };
 
 /**
  * Presents the captured data as formatted text.
  */
 DataView.prototype.onUpdateAllCompleted = function(data) {
+  // It's possible for a log file to be loaded while a dump is being generated.
+  // When that happens, don't display the log dump, to avoid any confusion.
+  if (g_browser.isViewingLogFile())
+    return;
   this.waitingForUpdate_ = false;
   var text = [];
 
   // Print some basic information about our environment.
   text.push('Data exported on: ' + (new Date()).toLocaleString());
   text.push('');
   text.push('Number of passively captured events: ' +
             g_browser.getNumPassivelyCapturedEvents());
   text.push('Number of actively captured events: ' +
             g_browser.getNumActivelyCapturedEvents());
@@ skipping 270 matching lines @@
  * Select all text from log dump.
  */
 DataView.prototype.selectText_ = function() {
   var selection = window.getSelection();
   selection.removeAllRanges();
 
   var range = document.createRange();
   range.selectNodeContents(this.textPre_);
   selection.addRange(range);
 };