Allow app list tiles to show search results in the experimental app list.

ui/app_list/views/search_result_list_view.cc

 // Copyright (c) 2012 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/views/search_result_list_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
+#include "ui/app_list/search_result.h"
 #include "ui/app_list/views/search_result_list_view_delegate.h"
 #include "ui/app_list/views/search_result_view.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 
 const int kMaxResults = 6;
@@ skipping 131 matching lines @@
   SetAutoLaunchTimeout(base::TimeDelta());
   view_delegate_->AutoLaunchCanceled();
 }
 
 SearchResultView* SearchResultListView::GetResultViewAt(int index) {
   DCHECK(index >= 0 && index < results_container_->child_count());
   return static_cast<SearchResultView*>(results_container_->child_at(index));
 }
 
 void SearchResultListView::Update() {
-  last_visible_index_ = 0;
+  std::vector<SearchResult*> display_results =
+      AppListModel::GetSearchResultsForDisplayType(
+          results_,
+          SearchResult::DISPLAY_LIST,
+          results_container_->child_count());
+  last_visible_index_ = display_results.size() - 1;
+
   for (size_t i = 0; i < static_cast<size_t>(results_container_->child_count());
        ++i) {
     SearchResultView* result_view = GetResultViewAt(i);
-    if (i < results_->item_count()) {
-      result_view->SetResult(results_->GetItemAt(i));
-      result_view->SetVisible(true);
-      last_visible_index_ = i;
-    } else {
-      result_view->SetResult(NULL);
-      result_view->SetVisible(false);
-    }
+    SearchResult* item = NULL;
+    if (i < display_results.size())

[Matt Giuca, 2014/08/06 08:54:53]

I think I prefer the old formulation of:

if (i < display_results.size()) {
  result_view->SetResult(display_results[i]);
  result_view->SetVisible(true);
} else {
  result_view->SetResult(NULL);
  result_view->SetVisible(false);
}

It's clearer than inventing a new variable just to write it conditionally, and
then act on it conditionally.

[calamity, 2014/08/12 05:03:37]

Done.

+      item = display_results[i];
+
+    result_view->SetResult(item);
+    result_view->SetVisible(item != NULL);
   }
   if (selected_index_ > last_visible_index_)
     SetSelectedIndex(last_visible_index_);
 
   Layout();
   update_factory_.InvalidateWeakPtrs();
   UpdateAutoLaunchState();
 }
 
 void SearchResultListView::ScheduleUpdate() {
@@ skipping 95 matching lines @@
   if (delegate_ && view->result())
     delegate_->OnResultInstalled(view->result());
 }
 
 void SearchResultListView::OnSearchResultUninstalled(SearchResultView* view) {
   if (delegate_ && view->result())
     delegate_->OnResultUninstalled(view->result());
 }
 
 }  // namespace app_list