[Merge to M53][Chrome OS] Change layout of the launcher.

ui/app_list/search_controller.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_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 13 matching lines @@
 
 // Maximum time (in milliseconds) to wait to the search providers to finish.
 const int kStopTimeMS = 1500;
 }
 
 namespace app_list {
 
 SearchController::SearchController(SearchBoxModel* search_box,
                                    AppListModel::SearchResults* results,
                                    History* history)
-    : search_box_(search_box),
-      dispatching_query_(false),
-      mixer_(new Mixer(results)),
-      history_(history),
-      is_voice_query_(false) {
-}
+    : search_box_(search_box), mixer_(new Mixer(results)), history_(history) {}
 
 SearchController::~SearchController() {
 }
 
 void SearchController::Start(bool is_voice_query) {
   Stop();
 
   base::string16 query;
   base::TrimWhitespace(search_box_->text(), base::TRIM_ALL, &query);
 
   dispatching_query_ = true;
   for (Providers::iterator it = providers_.begin();
        it != providers_.end();
        ++it) {
     (*it)->Start(is_voice_query, query);
   }
   dispatching_query_ = false;
+  query_for_recommendation_ = query.empty() ? true : false;
 
   is_voice_query_ = is_voice_query;
 
   OnResultsChanged();
 
   stop_timer_.Start(FROM_HERE,
                     base::TimeDelta::FromMilliseconds(kStopTimeMS),
                     base::Bind(&SearchController::Stop,
                                base::Unretained(this)));
 }
@@ skipping 52 matching lines @@
 }
 
 size_t SearchController::AddOmniboxGroup(size_t max_results,
                                          double boost,
                                          double multiplier) {
   return mixer_->AddOmniboxGroup(max_results, boost, multiplier);
 }
 
 void SearchController::AddProvider(size_t group_id,
                                    std::unique_ptr<SearchProvider> provider) {
-  provider->set_result_changed_callback(base::Bind(
-      &SearchController::OnResultsChanged,
-      base::Unretained(this)));
+  provider->set_result_changed_callback(
+      base::Bind(&SearchController::OnResultsChanged, base::Unretained(this)));
   mixer_->AddProviderToGroup(group_id, provider.get());
   providers_.push_back(std::move(provider));
 }
 
 void SearchController::OnResultsChanged() {
   if (dispatching_query_)
     return;
 
   KnownResults known_results;
   if (history_ && history_->IsReady()) {
     history_->GetKnownResults(base::UTF16ToUTF8(search_box_->text()))
         ->swap(known_results);
   }
 
-  mixer_->MixAndPublish(is_voice_query_, known_results);
+  size_t num_max_results =
+      query_for_recommendation_ ? kNumStartPageTiles : kMaxSearchResults;
+  mixer_->MixAndPublish(is_voice_query_, known_results, num_max_results);
 }
 
 }  // namespace app_list