[chrome://omnibox] Update result details for real omnibox inputs.

Above each response, the debugs page displays result details including:
1) cursor position
2) elapsed time
3) all providers done
4) host
5) has isTypedHost
These are updated when inputting into the HTML omnibox, but when inputting into
the window omnibox, only (3) is updated correctly.

This CL:
1) Updates the 5 fields when inputting from the window omnibox.
2) Adds 'input type' (e.g. URL).
3) Wires in cursor position similar to the other 4 fields from the page handler
and removes the hacked cursor position wired in from query inputs.
4) Updates the label for (5) to 'is typed host'.
5) Rearranges related variables to be consistent between files.

Bug: 1011632
Change-Id: I830b4af3d01d18faafbdaaeaea8614624a401c4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846311Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704258}

chrome/browser/resources/omnibox/omnibox.html

@@ -268,10 +268,9 @@
     <span class="label">
       all providers done = <span id="done"></span>
     </span>
+    <span class="label">type = <span id="type"></span></span>
     <span class="label">host = <span id="host"></span></span>
-    <span class="label">
-      has isTypedHost = <span id="is-typed-host"></span>
-    </span>
+    <span class="label">is typed host = <span id="is-typed-host"></span></span>
   </template>
 
   <omnibox-input id="omnibox-input"></omnibox-input>

chrome/browser/resources/omnibox/omnibox.js

@@ -158,7 +158,6 @@ document.addEventListener('DOMContentLoaded', () => {
   exportDelegate = new ExportDelegate(omniboxOutput, omniboxInput);
 
   omniboxInput.addEventListener('query-inputs-changed', e => {
-    omniboxOutput.updateQueryInputs(e.detail);
     browserProxy.makeRequest(
         e.detail.inputText, e.detail.resetAutocompleteController,
         e.detail.cursorPosition, e.detail.zeroSuggest,
@@ -211,7 +210,6 @@ class ExportDelegate {
     }
     this.omniboxInput_.queryInputs = importData.queryInputs;
     this.omniboxInput_.displayInputs = importData.displayInputs;
-    this.omniboxOutput_.updateQueryInputs(importData.queryInputs);
     this.omniboxOutput_.updateDisplayInputs(importData.displayInputs);
     this.omniboxOutput_.setResponsesHistory(importData.responsesHistory);
     return true;

chrome/browser/resources/omnibox/omnibox_output.js

@@ -8,6 +8,7 @@ cr.define('omnibox_output', function() {
    *   cursorPosition: number,
    *   time: number,
    *   done: boolean,
+   *   type: string,
    *   host: string,
    *   isTypedHost: boolean,
    * }}
@@ -31,19 +32,12 @@ cr.define('omnibox_output', function() {
       this.responsesHistory = [];
       /** @private {!Array<!OutputResultsGroup>} */
       this.resultsGroups_ = [];
-      /** @private {!QueryInputs} */
-      this.queryInputs_ = /** @type {!QueryInputs} */ ({});
       /** @private {!DisplayInputs} */
       this.displayInputs_ = OmniboxInput.defaultDisplayInputs;
       /** @private {string} */
       this.filterText_ = '';
     }
 
-    /** @param {!QueryInputs} queryInputs */
-    updateQueryInputs(queryInputs) {
-      this.queryInputs_ = queryInputs;
-    }
-
     /** @param {!DisplayInputs} displayInputs */
     updateDisplayInputs(displayInputs) {
       this.displayInputs_ = displayInputs;
@@ -103,8 +97,7 @@ cr.define('omnibox_output', function() {
      * @private @param {!mojom.OmniboxResponse} response
      */
     createResultsGroup_(response) {
-      const resultsGroup =
-          OutputResultsGroup.create(response, this.queryInputs_.cursorPosition);
+      const resultsGroup = OutputResultsGroup.create(response);
       this.resultsGroups_.push(resultsGroup);
       this.$$('#contents').appendChild(resultsGroup);
 
@@ -190,12 +183,11 @@ cr.define('omnibox_output', function() {
   class OutputResultsGroup extends OmniboxElement {
     /**
      * @param {!mojom.OmniboxResponse} resultsGroup
-     * @param {number} cursorPosition
      * @return {!OutputResultsGroup}
      */
-    static create(resultsGroup, cursorPosition) {
+    static create(resultsGroup) {
       const outputResultsGroup = new OutputResultsGroup();
-      outputResultsGroup.setResultsGroup(resultsGroup, cursorPosition);
+      outputResultsGroup.setResultsGroup(resultsGroup);
       return outputResultsGroup;
     }
 
@@ -203,18 +195,16 @@ cr.define('omnibox_output', function() {
       super('output-results-group-template');
     }
 
-    /**
-     *  @param {!mojom.OmniboxResponse} resultsGroup
-     *  @param {number} cursorPosition
-     */
-    setResultsGroup(resultsGroup, cursorPosition) {
+    /** @param {!mojom.OmniboxResponse} resultsGroup */
+    setResultsGroup(resultsGroup) {
       /** @private {ResultsDetails} */
       this.details_ = {
-        cursorPosition: cursorPosition,
+        cursorPosition: resultsGroup.cursorPosition,
         time: resultsGroup.timeSinceOmniboxStartedMs,
         done: resultsGroup.done,
+        type: resultsGroup.type,
         host: resultsGroup.host,
-        isTypedHost: resultsGroup.isTypedHost
+        isTypedHost: resultsGroup.isTypedHost,
       };
       /** @type {!Array<!OutputHeader>} */
       this.headers = COLUMNS.map(OutputHeader.create);
@@ -353,6 +343,7 @@ cr.define('omnibox_output', function() {
       this.$$('#cursor-position').textContent = details.cursorPosition;
       this.$$('#time').textContent = details.time;
       this.$$('#done').textContent = details.done;
+      this.$$('#type').textContent = details.type;
       this.$$('#host').textContent = details.host;
       this.$$('#is-typed-host').textContent = details.isTypedHost;
     }

chrome/browser/ui/webui/omnibox/omnibox.mojom

@@ -52,9 +52,10 @@ struct AutocompleteResultsForProvider {
 };
 
 struct OmniboxResponse {
-  bool done;
+  int32 cursor_position;
   // Time delta since the request was started, in milliseconds.
   int32 time_since_omnibox_started_ms;
+  bool done;
   // The inferred metrics::OmniboxInputType of the request represented as a
   // string.
   string type;

chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc

@@ -235,22 +235,25 @@ void OmniboxPageHandler::OnResultChanged(bool default_match_changed) {
 }
 
 void OmniboxPageHandler::OnOmniboxQuery(AutocompleteController* controller,
-                                        const base::string16& input_text) {
+                                        const AutocompleteInput& input) {
+  time_omnibox_started_ = base::Time::Now();
+  input_ = input;
   page_->HandleNewAutocompleteQuery(controller == controller_.get(),
-                                    base::UTF16ToUTF8(input_text));
+                                    base::UTF16ToUTF8(input.text()));
 }
 
 void OmniboxPageHandler::OnOmniboxResultChanged(
     bool default_match_changed,
     AutocompleteController* controller) {
   mojom::OmniboxResponsePtr response(mojom::OmniboxResponse::New());
-  response->done = controller->done();
+  response->cursor_position = input_.cursor_position();
   response->time_since_omnibox_started_ms =
       (base::Time::Now() - time_omnibox_started_).InMilliseconds();
+  response->done = controller->done();
+  response->type = AutocompleteInput::TypeToString(input_.type());
   const base::string16 host =
       input_.text().substr(input_.parts().host.begin, input_.parts().host.len);
   response->host = base::UTF16ToUTF8(host);
-  response->type = AutocompleteInput::TypeToString(input_.type());
   bool is_typed_host;
   if (!LookupIsTypedHost(host, &is_typed_host))
     is_typed_host = false;
@@ -392,30 +395,22 @@ void OmniboxPageHandler::StartOmniboxQuery(const std::string& input_string,
   // actual results to not depend on the state of the previous request.
   if (reset_autocomplete_controller)
     ResetController();
-  // TODO (manukh): OmniboxPageHandler::StartOmniboxQuery is invoked only for
-  // queries from the debug page and not for queries from the browser omnibox.
-  // time_omnibox_started_ and input_ are therefore not set for browser omnibox
-  // queries, resulting in inaccurate time_since_omnibox_started_ms, host, type,
-  // and is_typed_host values in the result object being sent to the debug page.
-  // For the user, this means the 'details' section is mostly inaccurate for
-  // browser omnibox queries.
-  time_omnibox_started_ = base::Time::Now();
-  input_ = AutocompleteInput(
+  AutocompleteInput input(
       base::UTF8ToUTF16(input_string), cursor_position,
       static_cast<metrics::OmniboxEventProto::PageClassification>(
           page_classification),
       ChromeAutocompleteSchemeClassifier(profile_));
   GURL current_url_gurl{current_url};
   if (current_url_gurl.is_valid())
-    input_.set_current_url(current_url_gurl);
-  input_.set_current_title(base::UTF8ToUTF16(current_url));
-  input_.set_prevent_inline_autocomplete(prevent_inline_autocomplete);
-  input_.set_prefer_keyword(prefer_keyword);
+    input.set_current_url(current_url_gurl);
+  input.set_current_title(base::UTF8ToUTF16(current_url));
+  input.set_prevent_inline_autocomplete(prevent_inline_autocomplete);
+  input.set_prefer_keyword(prefer_keyword);
   if (prefer_keyword)
-    input_.set_keyword_mode_entry_method(metrics::OmniboxEventProto::TAB);
-  input_.set_from_omnibox_focus(zero_suggest);
+    input.set_keyword_mode_entry_method(metrics::OmniboxEventProto::TAB);
+  input.set_from_omnibox_focus(zero_suggest);
 
-  OnOmniboxQuery(controller_.get(), input_.text());
+  OnOmniboxQuery(controller_.get(), input);
   controller_->Start(input_);
 }
 

chrome/browser/ui/webui/omnibox/omnibox_page_handler.h

@@ -43,7 +43,7 @@ class OmniboxPageHandler : public AutocompleteControllerDelegate,
 
   // OmniboxControllerEmitter::Observer overrides:
   void OnOmniboxQuery(AutocompleteController* controller,
-                      const base::string16& input_text) override;
+                      const AutocompleteInput& input) override;
   void OnOmniboxResultChanged(bool default_match_changed,
                               AutocompleteController* controller) override;
 

chrome/test/base/ui_test_utils.cc

@@ -219,7 +219,7 @@ class AutocompleteChangeObserver : public OmniboxControllerEmitter::Observer {
 
   // OmniboxControllerEmitter::Observer:
   void OnOmniboxQuery(AutocompleteController* controller,
-                      const base::string16& input_text) override {}
+                      const AutocompleteInput& input) override {}
   void OnOmniboxResultChanged(bool default_match_changed,
                               AutocompleteController* controller) override {
     if (run_loop_.running())

components/omnibox/browser/omnibox_controller.cc

@@ -35,7 +35,7 @@ void OmniboxController::StartAutocomplete(
 
   if (client_->GetOmniboxControllerEmitter()) {
     client_->GetOmniboxControllerEmitter()->NotifyOmniboxQuery(
-        autocomplete_controller_.get(), input.text());
+        autocomplete_controller_.get(), input);
   }
 
   // We don't explicitly clear OmniboxPopupModel::manually_selected_match, as

components/omnibox/browser/omnibox_controller_emitter.cc

@@ -69,9 +69,9 @@ void OmniboxControllerEmitter::RemoveObserver(Observer* observer) {
 
 void OmniboxControllerEmitter::NotifyOmniboxQuery(
     AutocompleteController* controller,
-    const base::string16& input_text) {
+    const AutocompleteInput& input) {
   for (Observer& observer : observers_)
-    observer.OnOmniboxQuery(controller, input_text);
+    observer.OnOmniboxQuery(controller, input);
 }
 
 void OmniboxControllerEmitter::NotifyOmniboxResultChanged(

components/omnibox/browser/omnibox_controller_emitter.h

@@ -23,7 +23,7 @@ class OmniboxControllerEmitter : public KeyedService {
     // Invoked when new autocomplete queries are made from the omnibox
     // controller or when those queries' results change.
     virtual void OnOmniboxQuery(AutocompleteController* controller,
-                                const base::string16& input_text) = 0;
+                                const AutocompleteInput& input) = 0;
     virtual void OnOmniboxResultChanged(bool default_match_changed,
                                         AutocompleteController* controller) = 0;
   };
@@ -43,7 +43,7 @@ class OmniboxControllerEmitter : public KeyedService {
   // Notifies registered observers when new autocomplete queries are made from
   // the omnibox controller or when those queries' results change.
   void NotifyOmniboxQuery(AutocompleteController* controller,
-                          const base::string16& input_text);
+                          const AutocompleteInput& input);
   void NotifyOmniboxResultChanged(bool default_match_changed,
                                   AutocompleteController* controller);