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

ui/app_list/search/mixer.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 "ui/app_list/search/mixer.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
 
 // Used to group relevant providers together fox mixing their results.
 class Mixer::Group {
  public:
   Group(size_t max_results, double boost)
       : max_results_(max_results), boost_(boost) {}
   ~Group() {}
 
   void AddProvider(SearchProvider* provider) { providers_.push_back(provider); }
 
-  void FetchResults(const KnownResults& known_results) {
+  void FetchResults(bool is_voice_query, const KnownResults& known_results) {
     results_.clear();
 
     for (Providers::const_iterator provider_it = providers_.begin();
          provider_it != providers_.end();
          ++provider_it) {
       for (SearchProvider::Results::const_iterator result_it =
                (*provider_it)->results().begin();
            result_it != (*provider_it)->results().end();
            ++result_it) {
         DCHECK_GE((*result_it)->relevance(), 0.0);
@@ skipping 16 matching lines @@
               break;
             case PREFIX_SECONDARY:
               boost = 3.0;
               break;
             case UNKNOWN_RESULT:
               NOTREACHED() << "Unknown result in KnownResults?";
               break;
           }
         }
 
+        // If this is a voice query, voice results receive a massive boost.
+        if (is_voice_query && (*result_it)->voice_result())
+          boost += 4.0;
+
         results_.push_back(
             SortData(*result_it, (*result_it)->relevance() + boost));
       }
     }
 
     std::sort(results_.begin(), results_.end());
     if (max_results_ != kNoMaxResultsLimit && results_.size() > max_results_)
       results_.resize(max_results_);
   }
 
@@ skipping 20 matching lines @@
   groups_[MAIN_GROUP].reset(new Group(kMaxMainGroupResults, 3.0));
   groups_[OMNIBOX_GROUP].reset(new Group(kNoMaxResultsLimit, 2.0));
   groups_[WEBSTORE_GROUP].reset(new Group(kMaxWebstoreResults, 1.0));
   groups_[PEOPLE_GROUP].reset(new Group(kMaxPeopleResults, 0.0));
 }
 
 void Mixer::AddProviderToGroup(GroupId group, SearchProvider* provider) {
   groups_[group]->AddProvider(provider);
 }
 
-void Mixer::MixAndPublish(const KnownResults& known_results) {
-  FetchResults(known_results);
+void Mixer::MixAndPublish(bool is_voice_query,
+                          const KnownResults& known_results) {
+  FetchResults(is_voice_query, known_results);
 
   SortedResults results;
   results.reserve(kMaxResults);
 
   const Group& main_group = *groups_[MAIN_GROUP];
   const Group& omnibox_group = *groups_[OMNIBOX_GROUP];
   const Group& webstore_group = *groups_[WEBSTORE_GROUP];
   const Group& people_group = *groups_[PEOPLE_GROUP];
 
   // Adds main group and web store results first.
@@ skipping 87 matching lines @@
     if (id_set.find(id) != id_set.end())
       continue;
 
     id_set.insert(id);
     final.push_back(*it);
   }
 
   results->swap(final);
 }
 
-void Mixer::FetchResults(const KnownResults& known_results) {
+void Mixer::FetchResults(bool is_voice_query,
+                         const KnownResults& known_results) {
   for (const auto& item : groups_)
-    item.second->FetchResults(known_results);
+    item.second->FetchResults(is_voice_query, known_results);
 }
 
 }  // namespace app_list