Make chrome://omnibox/ be able to report per-provider matches.

chrome/browser/resources/omnibox/omnibox.js

 // Copyright (c) 2012 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.
 
 /**
  * Javascript for omnibox.html, served from chrome://omnibox/
  * This is used to debug omnibox ranking.  The user enters some text
  * into a box, submits it, and then sees lots of debug information
  * from the autocompleter that shows what omnibox would do with that
  * input.
  *
  * The simple object defined in this javascript file listens for
  * certain events on omnibox.html, sends (when appropriate) the
  * input text to C++ code to start the omnibox autcomplete controller
  * working, and listens from callbacks from the C++ code saying that
  * results are available.  When results (possibly intermediate ones)
  * are available, the Javascript formats them and displays them.
  */
 cr.define('omniboxDebug', function() {
   'use strict';
 
   /**
    * Register our event handlers.
    */
   function initialize() {
     document.getElementById('omnibox-input-form').addEventListener(
         'submit', startOmniboxQuery, false);
-    document.getElementById('show-details').addEventListener(
-        'change', refresh);
-    document.getElementById('show-incomplete-results').addEventListener(
+    document.getElementById('omnibox-input-form-options').addEventListener(
         'change', refresh);

[arv (Not doing code reviews), 2012/01/31 20:29:05]

you need to pass a third argument here

[Mark P, 2012/01/31 20:55:34]

false?

You do realize that in an earlier code review where I had false you told me to
remove it.
http://codereview.chromium.org/9129029/diff/1/chrome/browser/resources/omnibo...

   }
 
   /**
    * @type {Array.<Object>} an array of all autocomplete results we've seen
    *     for this query.  We append to this list once for every call to
    *     handleNewAutocompleteResult.  For details on the structure of
    *     the object inside, see the comments by addResultToOutput.
    */
   var progressiveAutocompleteResults = [];
 
@@ skipping 40 matching lines @@
    * @type {Array.<Object>}
    * @const
    */
   var PROPERTY_OUTPUT_ORDER = [
     new PresentationInfoRecord('URL', '', 'destination_url', true),
     new PresentationInfoRecord('Provider Name', '', 'provider_name', true),
     new PresentationInfoRecord('Type', '', 'type', true),
     new PresentationInfoRecord('Relevance', '', 'relevance', true),
     new PresentationInfoRecord('Starred', '', 'starred', false),
     new PresentationInfoRecord(
-        '== default_match iterator', '', 'is_default_match', false),
-    new PresentationInfoRecord(
         'Is History What You Typed Match', '',
         'is_history_what_you_typed_match', false),
     new PresentationInfoRecord('Description', '', 'description', false),
     new PresentationInfoRecord('Contents', '', 'contents', false),
     new PresentationInfoRecord('Fill Into Edit', '', 'fill_into_edit', false),
     new PresentationInfoRecord(
         'Inline Autocomplete Offset', '', 'inline_autocomplete_offset', false),
     new PresentationInfoRecord('Deletable', '', 'deletable', false),
     new PresentationInfoRecord('From Previous', '', 'from_previous', false),
     new PresentationInfoRecord(
@@ skipping 77 matching lines @@
   /**
    * Appends some human-readable information about the provided
    * autocomplete result to the HTML node with id omnibox-debug-text.
    * The current human-readable form is a few lines about general
    * autocomplete result statistics followed by a table with one line
    * for each autocomplete match.  The input parameter result is a
    * complex Object with lots of information about various
    * autocomplete matches.  Here's an example of what it looks like:
    * <pre>
    * {@code
-   * { 'done': false,
+   * {
+   *   'done': false,
    *   'time_since_omnibox_started_ms': 15,
-   *   'num_items': 4,
-   *   'item_0': {
-   *     'destination_url': 'http://mail.google.com',
-   *     'provider_name': 'HistoryURL',
-   *     'relevance': 1410,
-   *     'is_default_match': true,
+   *   'combined_results' : {
+   *     'num_items': 4,
+   *     'item_0': {
+   *       'destination_url': 'http://mail.google.com',
+   *       'provider_name': 'HistoryURL',
+   *       'relevance': 1410,
+   *       ...
+   *     }
+   *     'item_1: {
+   *       ...
+   *     }
    *     ...
    *   }
-   *   'item_1: {
+   *   'results_by_provider': {
+   *     'HistoryURL' : {
+   *       'num_items': 3,
+   *         ...
+   *       }
+   *     'Search' : {
+   *       'num_items': 1,
+   *       ...
+   *     }
    *     ...
    *   }
-   *   ...
    * }
    * }
    * </pre>
-   * For information on how the result is packed, see the
+   * For more information on how the result is packed, see the
    * corresponding code in chrome/browser/ui/webui/omnibox_ui.cc
    */
   function addResultToOutput(result) {
     var output = document.getElementById('omnibox-debug-text');
     var inDetailedMode = document.getElementById('show-details').checked;
     var showIncompleteResults =
         document.getElementById('show-incomplete-results').checked;
+    var showPerProviderResults =
+        document.getElementById('show-all-providers').checked;
 
     // Output the result-level features in detailed mode and in
     // show incomplete results mode.  We do the latter because without
     // these result-level features, one can't make sense of each
     // batch of results.
     if (inDetailedMode || showIncompleteResults) {
       var p1 = document.createElement('p');
       p1.textContent = 'elapsed time = ' +
           result.time_since_omnibox_started_ms + 'ms';
       output.appendChild(p1);
       var p2 = document.createElement('p');
       p2.textContent = 'all providers done = ' + result.done;
       output.appendChild(p2);
     }
 
+    if (!showPerProviderResults) {
+      // Add combined/merged result table (without label).
+      output.appendChild(addResultTableToOutput(result.combined_results));
+    } else {
+      // Add combined/merged result table with label.
+      var p = document.createElement('p');
+      p.textContent = 'combined results:';
+      p.appendChild(addResultTableToOutput(result.combined_results));
+      output.appendChild(p);
+      // Add the pre-provider result tables with labels.
+      for (var provider in result.results_by_provider) {
+        p = document.createElement('p');
+        p.appendChild(document.createTextNode(provider + ' provider results:'));
+        p.appendChild(addResultTableToOutput(
+            result.results_by_provider[provider]));
+        output.appendChild(p);
+      }
+    }
+  }
+
+  /**
+   * @param {Object} result either the combined_results component of
+   *     the structure described in the comment by addResultToOutput()
+   *     above or one of the per-provider results in the structure.
+   *     (Both have the same format.)
+   * @return {HTMLTableCellElement} that is a user-readable HTML
+   *     representation of this object.
+   */
+  function addResultTableToOutput(result) {
+    var inDetailedMode = document.getElementById('show-details').checked;
     // Create a table to hold all the autocomplete items.
     var table = document.createElement('table');
     table.className = 'autocomplete-results-table';
     table.appendChild(createAutocompleteResultTableHeader());
     // Loop over every autocomplete item and add it as a row in the table.
     for (var i = 0; i < result.num_items; i++) {
       var autocompleteSuggestion = result['item_' + i];
       var row = document.createElement('tr');
       // Loop over all the columns/properties and output either them
       // all (if we're in detailed mode) or only the ones marked displayAlways.
@@ skipping 20 matching lines @@
           if (!displayedProperties[key]) {
             var cell = document.createElement('td');
             cell.textContent = key + '=' + autocompleteSuggestion[key];
             row.appendChild(cell);
           }
         }
       }
 
       table.appendChild(row);
     }
-    output.appendChild(table);
+    return table;
   }
 
   /* Repaints the page based on the contents of the array
    * progressiveAutocompleteResults, which represents consecutive
    * autocomplete results.  We only display the last (most recent)
    * entry unless we're asked to display incomplete results.  For an
    * example of the output, play with chrome://omnibox/
    */
   function refresh() {
     // Erase whatever is currently being displayed.
@@ skipping 11 matching lines @@
   }
 
   return {
     initialize: initialize,
     startOmniboxQuery: startOmniboxQuery,
     handleNewAutocompleteResult: handleNewAutocompleteResult
   };
 });
 
 document.addEventListener('DOMContentLoaded', omniboxDebug.initialize);