App list voice searches now prioritize exact-match web results.

chrome/browser/ui/app_list/search/omnibox_provider.cc

 // Copyright 2013 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/ui/app_list/search/omnibox_provider.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
+#include "components/omnibox/autocomplete_match_type.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/search_result.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace app_list {
 
 namespace {
 
 int ACMatchStyleToTagStyle(int styles) {
   int tag_styles = 0;
@@ skipping 55 matching lines @@
     }
     set_id(match_.destination_url.spec());
 
     // Derive relevance from omnibox relevance and normalize it to [0, 1].
     // The magic number 1500 is the highest score of an omnibox result.
     // See comments in autocomplete_provider.h.
     set_relevance(match_.relevance / 1500.0);
 
     UpdateIcon();
     UpdateTitleAndDetails();
+
+    // The raw "what you typed" search results should be promoted and
+    // automatically selected by voice queries. If a "history" result exactly
+    // matches what you typed, then the omnibox will not produce a "what you
+    // typed" result; therefore, we must also flag "history" results as voice
+    // results if they exactly match the query.
+    if (match_.type == AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED ||
+        (match_.type == AutocompleteMatchType::SEARCH_HISTORY &&
+         match_.contents == match_.search_terms_args->original_query)) {
+      set_voice_result(true);
+    }
   }
   ~OmniboxResult() override {}
 
   // SearchResult overrides:
   void Open(int event_flags) override {
     RecordHistogram(OMNIBOX_SEARCH_RESULT);
     list_controller_->OpenURL(profile_,
                               match_.destination_url,
                               match_.transition,
                               ui::DispositionFromEventFlags(event_flags));
@@ skipping 79 matching lines @@
         new OmniboxResult(profile_, list_controller_, controller_.get(), *it)));
   }
 }
 
 void OmniboxProvider::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = controller_->result();
   PopulateFromACResult(result);
 }
 
 }  // namespace app_list