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

ui/app_list/search/mixer.h

 // 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.
 
 #ifndef UI_APP_LIST_SEARCH_MIXER_H_
 #define UI_APP_LIST_SEARCH_MIXER_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 39 matching lines @@
   // Adds a new mixer group for the special "omnibox" group. This group will be
   // treated specially by the Mixer (it will be truncated such that it fills the
   // remaining slots without overflowing, but with at least one result). A
   // maximum of one group should be added using this method.
   size_t AddOmniboxGroup(size_t max_results, double boost, double multiplier);
 
   // Associates a provider with a mixer group.
   void AddProviderToGroup(size_t group_id, SearchProvider* provider);
 
   // Collects the results, sorts and publishes them.
-  void MixAndPublish(bool is_voice_query, const KnownResults& known_results);
+  void MixAndPublish(bool is_voice_query,
+                     const KnownResults& known_results,
+                     size_t num_max_results);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(test::MixerTest, Publish);
 
   // Used for sorting and mixing results.
   struct APP_LIST_EXPORT SortData {
     SortData();
     SortData(SearchResult* result, double score);
 
     bool operator<(const SortData& other) const;
@@ skipping 30 matching lines @@
   size_t omnibox_group_ = 0;
   // Whether |omnibox_group_| has been set.
   bool has_omnibox_group_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Mixer);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_SEARCH_MIXER_H_