Re-design the "data" tab on about:net-internals.

chrome/browser/resources/net_internals/export_view.js

Index: chrome/browser/resources/net_internals/export_view.js
===================================================================
--- chrome/browser/resources/net_internals/export_view.js	(revision 94563)
+++ chrome/browser/resources/net_internals/export_view.js	(working copy)
@@ -3,35 +3,15 @@
 // found in the LICENSE file.
 
 /**
- * This view displays options for importing/exporting the captured data.  This
- * view is responsible for the interface and file I/O.  The BrowserBridge
- * handles creation and loading of the data dumps.
- *
- *   - Has a button to generate a JSON dump.
- *
- *   - Has a button to import a JSON dump.
- *
- *   - Shows how many events have been captured.
+ * This view displays options for exporting the captured data.
  *  @constructor
  */
-function DataView() {
-  const mainBoxId = 'dataTabContent';
+function ExportView() {
+  const mainBoxId = 'exportTabContent';
   const downloadIframeId = 'dataViewDownloadIframe';
   const saveFileButtonId = 'dataViewSaveLogFile';
   const dataViewSaveStatusTextId = 'dataViewSaveStatusText';
   const securityStrippingCheckboxId = 'securityStrippingCheckbox';
-  const byteLoggingCheckboxId = 'byteLoggingCheckbox';
-  const passivelyCapturedCountId = 'passivelyCapturedCount';
-  const activelyCapturedCountId = 'activelyCapturedCount';
-  const deleteAllId = 'dataViewDeleteAll';
-  const dumpDataDivId = 'dataViewDumpDataDiv';
-  const loadedDivId = 'dataViewLoadedDiv';
-  const loadedClientInfoTextId = 'dataViewLoadedClientInfoText';
-  const loadLogFileDropTargetId = 'dataViewDropTarget';
-  const loadLogFileId = 'dataViewLoadLogFile';
-  const dataViewLoadStatusTextId = 'dataViewLoadStatusText';
-  const capturingTextSpanId = 'dataViewCapturingTextSpan';
-  const loggingTextSpanId = 'dataViewLoggingTextSpan';
 
   DivView.call(this, mainBoxId);
 
@@ -39,242 +19,61 @@
   securityStrippingCheckbox.onclick =
       this.onSetSecurityStripping_.bind(this, securityStrippingCheckbox);
 
-  var byteLoggingCheckbox = $(byteLoggingCheckboxId);
-  byteLoggingCheckbox.onclick =
-      this.onSetByteLogging_.bind(this, byteLoggingCheckbox);
-
   this.downloadIframe_ = $(downloadIframeId);
 
   this.saveFileButton_ = $(saveFileButtonId);
   this.saveFileButton_.onclick = this.onSaveFile_.bind(this);
   this.saveStatusText_ = $(dataViewSaveStatusTextId);
 
-  this.activelyCapturedCountBox_ = $(activelyCapturedCountId);
-  this.passivelyCapturedCountBox_ = $(passivelyCapturedCountId);
-  $(deleteAllId).onclick = g_browser.sourceTracker.deleteAllSourceEntries.bind(
-      g_browser.sourceTracker);
 
-  this.dumpDataDiv_ = $(dumpDataDivId);
-  this.capturingTextSpan_ = $(capturingTextSpanId);
-  this.loggingTextSpan_ = $(loggingTextSpanId);
-
-  this.loadedDiv_ = $(loadedDivId);
-  this.loadedClientInfoText_ = $(loadedClientInfoTextId);
-
-  this.loadFileElement_ = $(loadLogFileId);
-  this.loadFileElement_.onchange = this.logFileChanged.bind(this);
-  this.loadStatusText_ = $(dataViewLoadStatusTextId);
-
-  var dropTarget = $(loadLogFileDropTargetId);
-  dropTarget.ondragenter = this.onDrag.bind(this);
-  dropTarget.ondragover = this.onDrag.bind(this);
-  dropTarget.ondrop = this.onDrop.bind(this);
-
-  this.updateEventCounts_();
-
   // Track blob for previous log dump so it can be revoked when a new dump is
   // saved.
   this.lastBlobURL_ = null;
-
-  g_browser.sourceTracker.addObserver(this);
 }
 
-inherits(DataView, DivView);
+inherits(ExportView, DivView);
 
 /**
- * Called whenever a new event is received.
- */
-DataView.prototype.onSourceEntryUpdated = function(sourceEntry) {
-  this.updateEventCounts_();
-};
-
-/**
- * Called whenever some log events are deleted.  |sourceIds| lists
- * the source IDs of all deleted log entries.
- */
-DataView.prototype.onSourceEntriesDeleted = function(sourceIds) {
-  this.updateEventCounts_();
-};
-
-/**
- * Called whenever all log events are deleted.
- */
-DataView.prototype.onAllSourceEntriesDeleted = function() {
-  this.updateEventCounts_();
-};
-
-/**
- * Called when a log file is loaded, after clearing the old log entries and
- * loading the new ones.  Hides parts of the page related to saving data, and
- * shows those related to loading.  Returns true to indicate the view should
- * still be visible.
- */
-DataView.prototype.onLoadLogFinish = function(data) {
-  setNodeDisplay(this.dumpDataDiv_, false);
-  setNodeDisplay(this.capturingTextSpan_, false);
-  setNodeDisplay(this.loggingTextSpan_, true);
-  setNodeDisplay(this.loadedDiv_, true);
-  this.updateLoadedClientInfo();
-  return true;
-};
-
-/**
- * Updates the counters showing how many events have been captured.
- */
-DataView.prototype.updateEventCounts_ = function() {
-  this.activelyCapturedCountBox_.textContent =
-      g_browser.sourceTracker.getNumActivelyCapturedEvents();
-  this.passivelyCapturedCountBox_.textContent =
-      g_browser.sourceTracker.getNumPassivelyCapturedEvents();
-};
-
-/**
- * Depending on the value of the checkbox, enables or disables logging of
- * actual bytes transferred.
- */
-DataView.prototype.onSetByteLogging_ = function(byteLoggingCheckbox) {
-  if (byteLoggingCheckbox.checked) {
-    g_browser.setLogLevel(LogLevelType.LOG_ALL);
-  } else {
-    g_browser.setLogLevel(LogLevelType.LOG_ALL_BUT_BYTES);
-  }
-};
-
-/**
  * Depending on the value of the checkbox, enables or disables stripping
  * cookies and passwords from log dumps and displayed events.
  */
-DataView.prototype.onSetSecurityStripping_ =
+ExportView.prototype.onSetSecurityStripping_ =
     function(securityStrippingCheckbox) {
   g_browser.sourceTracker.setSecurityStripping(
       securityStrippingCheckbox.checked);
 };
 
-DataView.prototype.onSecurityStrippingChanged = function() {
+ExportView.prototype.onSecurityStrippingChanged = function() {
 };
 
 /**
- * Called when something is dragged over the drop target.
- *
- * Returns false to cancel default browser behavior when a single file is being
- * dragged.  When this happens, we may not receive a list of files for security
- * reasons, which is why we allow the |files| array to be empty.
+ * Called when a log file is loaded, after clearing the old log entries and
+ * loading the new ones.  Returns false to indicate the view should be hidden.
  */
-DataView.prototype.onDrag = function(event) {
-  return event.dataTransfer.types.indexOf('Files') == -1 ||
-         event.dataTransfer.files.length > 1;
+ExportView.prototype.onLoadLogFinish = function(data) {
+  return false;
 };
 
 /**
- * Called when something is dropped onto the drop target.  If it's a single
- * file, tries to load it as a log file.
- */
-DataView.prototype.onDrop = function(event) {
-  if (event.dataTransfer.types.indexOf('Files') == -1 ||
-      event.dataTransfer.files.length != 1) {
-    return;
-  }
-  event.preventDefault();
-
-  // Loading a log file may hide the currently active tab.  Switch to the data
-  // tab to prevent this.
-  document.location.hash = 'data';
-
-  this.loadLogFile(event.dataTransfer.files[0]);
-};
-
-/**
- * Called when a log file is selected.
- *
- * Gets the log file from the input element and tries to read from it.
- */
-DataView.prototype.logFileChanged = function() {
-  this.loadLogFile(this.loadFileElement_.files[0]);
-};
-
-/**
- * Attempts to read from the File |logFile|.
- */
-DataView.prototype.loadLogFile = function(logFile) {
-  if (logFile) {
-    this.setLoadFileStatus('Loading log...', true);
-    var fileReader = new FileReader();
-
-    fileReader.onload = this.onLoadLogFile.bind(this, logFile);
-    fileReader.onerror = this.onLoadLogFileError.bind(this);
-
-    fileReader.readAsText(logFile);
-  }
-};
-
-/**
- * Displays an error message when unable to read the selected log file.
- * Also clears the file input control, so the same file can be reloaded.
- */
-DataView.prototype.onLoadLogFileError = function(event) {
-  this.loadFileElement_.value = null;
-  this.setLoadFileStatus(
-      'Error ' + getKeyWithValue(FileError, event.target.error.code) +
-          '.  Unable to read file.',
-      false);
-};
-
-DataView.prototype.onLoadLogFile = function(logFile, event) {
-  var result = loadLogFile(event.target.result, logFile.fileName);
-  this.setLoadFileStatus(result, false);
-};
-
-/**
- * Sets the load from file status text, displayed below the load file button,
- * to |text|.  Also enables or disables the save/load buttons based on the value
- * of |isLoading|, which must be true if the load process is still ongoing, and
- * false when the operation has stopped, regardless of success of failure.
- * Also, when loading is done, replaces the load button so the same file can be
- * loaded again.
- */
-DataView.prototype.setLoadFileStatus = function(text, isLoading) {
-  this.enableLoadFileElement_(!isLoading);
-  this.enableSaveFileButton_(!isLoading);
-  this.loadStatusText_.textContent = text;
-  this.saveStatusText_.textContent = '';
-
-  if (!isLoading) {
-    // Clear the button, so the same file can be reloaded.  Recreating the
-    // element seems to be the only way to do this.
-    var loadFileElementId = this.loadFileElement_.id;
-    var loadFileElementOnChange = this.loadFileElement_.onchange;
-    this.loadFileElement_.outerHTML = this.loadFileElement_.outerHTML;
-    this.loadFileElement_ = $(loadFileElementId);
-    this.loadFileElement_.onchange = loadFileElementOnChange;
-  }
-};
-
-/**
  * Sets the save to file status text, displayed below the save to file button,
- * to |text|.  Also enables or disables the save/load buttons based on the value
+ * to |text|.  Also enables or disables the save button based on the value
  * of |isSaving|, which must be true if the save process is still ongoing, and
  * false when the operation has stopped, regardless of success of failure.
  */
-DataView.prototype.setSaveFileStatus = function(text, isSaving) {
+ExportView.prototype.setSaveFileStatus = function(text, isSaving) {
   this.enableSaveFileButton_(!isSaving);
-  this.enableLoadFileElement_(!isSaving);
-  this.loadStatusText_.textContent = '';
   this.saveStatusText_.textContent = text;
 };
 
-DataView.prototype.enableSaveFileButton_ = function(enabled) {
+ExportView.prototype.enableSaveFileButton_ = function(enabled) {
   this.saveFileButton_.disabled = !enabled;
 };
 
-DataView.prototype.enableLoadFileElement_ = function(enabled) {
-  this.loadFileElement_.disabled = !enabled;
-};
-
 /**
- * If not already busy loading or saving a log dump, triggers asynchronous
+ * If not already busy saving a log dump, triggers asynchronous
  * generation of log dump and starts waiting for it to complete.
  */
-DataView.prototype.onSaveFile_ = function() {
+ExportView.prototype.onSaveFile_ = function() {
   if (this.saveFileButton_.disabled)
     return;
   // Clean up previous blob, if any, to reduce resource usage.
@@ -290,7 +89,7 @@
 /**
  * Creates a blob url and starts downloading it.
  */
-DataView.prototype.onLogDumpCreated_ = function(dumpText) {
+ExportView.prototype.onLogDumpCreated_ = function(dumpText) {
   var blobBuilder = new WebKitBlobBuilder();
   blobBuilder.append(dumpText, 'native');
   var textBlob = blobBuilder.getBlob('octet/stream');
@@ -298,30 +97,3 @@
   this.downloadIframe_.src = this.lastBlobURL_;
   this.setSaveFileStatus('Dump successful', false);
 };
-
-/**
- * Prints some basic information about the environment when the log was made.
- */
-DataView.prototype.updateLoadedClientInfo = function() {
-  this.loadedClientInfoText_.textContent = '';
-  if (typeof(ClientInfo) != 'object')
-    return;
-
-  var text = [];
-
-  // Dumps made with the command line option don't have a date.
-  if (ClientInfo.date) {
-    text.push('Data exported on: ' + ClientInfo.date);
-    text.push('');
-  }
-
-  text.push(ClientInfo.name +
-            ' ' + ClientInfo.version +
-            ' (' + ClientInfo.official +
-            ' ' + ClientInfo.cl +
-            ') ' + ClientInfo.version_mod);
-  text.push('OS Type: ' + ClientInfo.os_type);
-  text.push('Command line: ' + ClientInfo.command_line);
-
-  this.loadedClientInfoText_.textContent = text.join('\n');
-};