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

ui/app_list/views/start_page_view.cc

 // Copyright 2014 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/start_page_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
+#include "ui/app_list/search_result.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/tile_item_view.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 66 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DummySearchBoxView);
 };
 
 }  // namespace
 
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
                              AppListViewDelegate* view_delegate)
     : app_list_main_view_(app_list_main_view),
-      model_(NULL),
+      search_results_model_(NULL),
       view_delegate_(view_delegate),
       search_box_view_(new DummySearchBoxView(this, view_delegate_)),
       results_view_(
           new SearchResultListView(app_list_main_view, view_delegate)),
       instant_container_(new views::View),
       tiles_container_(new views::View),
-      show_state_(SHOW_START_PAGE) {
+      show_state_(SHOW_START_PAGE),
+      update_factory_(this) {
   // The view containing the start page WebContents and DummySearchBoxView.
   InitInstantContainer();
   AddChildView(instant_container_);
 
   // The view containing the search results.
   AddChildView(results_view_);
 
   // The view containing the start page tiles.
   InitTilesContainer();
   AddChildView(tiles_container_);
 
   SetModel(view_delegate_->GetModel());
   view_delegate_->AddObserver(this);
 }
 
 StartPageView::~StartPageView() {
   view_delegate_->RemoveObserver(this);
-  if (model_)
-    model_->RemoveObserver(this);
+  if (search_results_model_)
+    search_results_model_->RemoveObserver(this);
 }
 
 void StartPageView::InitInstantContainer() {
   views::BoxLayout* instant_layout_manager = new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0, kInstantContainerSpacing);
   instant_layout_manager->set_inside_border_insets(
       gfx::Insets(kTopMargin, 0, kInstantContainerSpacing, 0));
   instant_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   instant_layout_manager->set_cross_axis_alignment(
@@ skipping 26 matching lines @@
   tiles_container_->SetLayoutManager(tiles_layout_manager);
   for (size_t i = 0; i < kNumStartPageTiles; ++i) {
     TileItemView* tile_item = new TileItemView();
     tiles_container_->AddChildView(tile_item);
     tile_views_.push_back(tile_item);
   }
 }
 
 void StartPageView::SetModel(AppListModel* model) {
   DCHECK(model);
-  if (model_)
-    model_->RemoveObserver(this);
-  model_ = model;
-  model_->AddObserver(this);
-  results_view_->SetResults(model_->results());
+  if (search_results_model_)
+    search_results_model_->RemoveObserver(this);
+  search_results_model_ = model->results();
+  search_results_model_->AddObserver(this);
+  results_view_->SetResults(search_results_model_);
   Reset();
 }
 
 void StartPageView::Reset() {
   SetShowState(SHOW_START_PAGE);
-  if (!model_ || !model_->top_level_item_list())
-    return;
-
-  for (size_t i = 0; i < kNumStartPageTiles; ++i) {
-    AppListItem* item = NULL;
-    if (i < model_->top_level_item_list()->item_count())
-      item = model_->top_level_item_list()->item_at(i);
-    tile_views_[i]->SetAppListItem(item);
-  }
+  Update();
 }
 
 void StartPageView::ShowSearchResults() {
   SetShowState(SHOW_SEARCH_RESULTS);
+  Update();
 }
 
 void StartPageView::SetShowState(ShowState show_state) {
   instant_container_->SetVisible(show_state == SHOW_START_PAGE);
   results_view_->SetVisible(show_state == SHOW_SEARCH_RESULTS);
 
   // This can be called when the app list is closing (widget is invisible). In
   // that case, do not steal focus from other elements.
   if (show_state == SHOW_START_PAGE && GetWidget() && GetWidget()->IsVisible())
     search_box_view_->search_box()->RequestFocus();
 
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
 
+  if (show_state_ == SHOW_START_PAGE)
+    search_box_view_->ClearSearch();
+
   results_view_->UpdateAutoLaunchState();
   if (show_state == SHOW_SEARCH_RESULTS)
     results_view_->SetSelectedIndex(0);
 }
 
 bool StartPageView::IsShowingSearchResults() const {
   return show_state_ == SHOW_SEARCH_RESULTS;
 }
 
+void StartPageView::UpdateForTesting() {
+  Update();
+}
+
 bool StartPageView::OnKeyPressed(const ui::KeyEvent& event) {
   if (show_state_ == SHOW_SEARCH_RESULTS)
     return results_view_->OnKeyPressed(event);
 
   return false;
 }
 
 void StartPageView::Layout() {
   // Instant and search results take up the height of the instant container.
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(instant_container_->GetHeightForWidth(bounds.width()));
   instant_container_->SetBoundsRect(bounds);
   results_view_->SetBoundsRect(bounds);
 
   // Tiles begin where the instant container ends.
   bounds.set_y(bounds.bottom());
   bounds.set_height(tiles_container_->GetHeightForWidth(bounds.width()));
   tiles_container_->SetBoundsRect(bounds);
 }
 
+void StartPageView::Update() {
+  std::vector<SearchResult*> display_results =
+      AppListModel::FilterSearchResultsByDisplayType(search_results_model_,
+                                                     SearchResult::DISPLAY_TILE,
+                                                     kNumStartPageTiles);
+  for (size_t i = 0; i < kNumStartPageTiles; ++i) {
+    SearchResult* item = NULL;
+    if (i < display_results.size())
+      item = display_results[i];
+    tile_views_[i]->SetSearchResult(item);
+  }
+  tiles_container_->Layout();
+  Layout();
+  update_factory_.InvalidateWeakPtrs();
+}
+
+void StartPageView::ScheduleUpdate() {
+  // When search results are added one by one, each addition generates an update
+  // request. Consolidates those update requests into one Update call.
+  if (!update_factory_.HasWeakPtrs()) {
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&StartPageView::Update, update_factory_.GetWeakPtr()));
+  }
+}
+
 void StartPageView::QueryChanged(SearchBoxView* sender) {
   // Forward the search terms on to the real search box and clear the dummy
   // search box.
   app_list_main_view_->OnStartPageSearchTextfieldChanged(
       sender->search_box()->text());
   sender->search_box()->SetText(base::string16());
 }
 
 void StartPageView::OnProfilesChanged() {
   SetModel(view_delegate_->GetModel());
 }
 
-void StartPageView::OnAppListModelStatusChanged() {
-  Reset();
+void StartPageView::ListItemsAdded(size_t start, size_t count) {
+  ScheduleUpdate();
 }
 
-void StartPageView::OnAppListItemAdded(AppListItem* item) {
-  Reset();
+void StartPageView::ListItemsRemoved(size_t start, size_t count) {
+  ScheduleUpdate();
 }
 
-void StartPageView::OnAppListItemDeleted() {
-  Reset();
+void StartPageView::ListItemMoved(size_t index, size_t target_index) {
+  ScheduleUpdate();
 }
 
-void StartPageView::OnAppListItemUpdated(AppListItem* item) {
-  Reset();
+void StartPageView::ListItemsChanged(size_t start, size_t count) {
+  ScheduleUpdate();
 }
 
 }  // namespace app_list