[Chrome OS] Change layout of the launcher.

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>
 #include <vector>
 
 #include "base/macros.h"
+#include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/search_provider.h"
 #include "ui/app_list/search_result.h"
 
 namespace app_list {
 
 namespace {
 
 // Maximum number of results to show.
-const size_t kMinResults = 6;
+const size_t kMinResults = 9;
 
 void UpdateResult(const SearchResult& source, SearchResult* target) {
   target->set_display_type(source.display_type());
   target->set_title(source.title());
   target->set_title_tags(source.title_tags());
   target->set_details(source.details());
   target->set_details_tags(source.details_tags());
 }
 
 }  // namespace
@@ skipping 97 matching lines @@
 
 size_t Mixer::AddGroup(size_t max_results, double multiplier) {
   groups_.push_back(new Group(max_results, multiplier));
   return groups_.size() - 1;
 }
 
 void Mixer::AddProviderToGroup(size_t group_id, SearchProvider* provider) {
   groups_[group_id]->AddProvider(provider);
 }
 
-void Mixer::MixAndPublish(bool is_voice_query,
+void Mixer::MixAndPublish(bool is_empty_query,
+                          bool is_voice_query,
                           const KnownResults& known_results) {
   FetchResults(is_voice_query, known_results);
 
+  size_t num_max_results = is_empty_query ? kNumStartPageTiles : kMinResults;

[xiyuan, 2016/08/09 17:49:09]

Can we move this logic out of Mixer and pass this as an arg? Mixer does not need
to know the difference of empty query or not.

[xdai1, 2016/08/09 20:14:17]

Done.

+
   SortedResults results;
-  results.reserve(kMinResults);
+  results.reserve(num_max_results);
 
   // Add results from each group. Limit to the maximum number of results in each
   // group.
   for (const Group* group : groups_) {
     size_t num_results =
         std::min(group->results().size(), group->max_results());
     results.insert(results.end(), group->results().begin(),
                    group->results().begin() + num_results);
   }
   // Remove results with duplicate IDs before sorting. If two providers give a
   // result with the same ID, the result from the provider with the *lower group
   // number* will be kept (e.g., an app result takes priority over a web store
   // result with the same ID).
   RemoveDuplicates(&results);
   std::sort(results.begin(), results.end());
 
-  if (results.size() < kMinResults) {
+  if (results.size() < num_max_results) {
     size_t original_size = results.size();
     // We didn't get enough results. Insert all the results again, and this
     // time, do not limit the maximum number of results from each group. (This
     // will result in duplicates, which will be removed by RemoveDuplicates.)
     for (const Group* group : groups_) {
       results.insert(results.end(), group->results().begin(),
                      group->results().end());
     }
     RemoveDuplicates(&results);
     // Sort just the newly added results. This ensures that, for example, if
@@ skipping 75 matching lines @@
   results->swap(final);
 }
 
 void Mixer::FetchResults(bool is_voice_query,
                          const KnownResults& known_results) {
   for (auto* group : groups_)
     group->FetchResults(is_voice_query, known_results);
 }
 
 }  // namespace app_list