Add search results to experimental app list start page.

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/views/app_list_main_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/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace app_list {
 
 namespace {
@@ skipping 46 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BarPlaceholderButton);
 };
 
 }  // namespace
 
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
                              AppListViewDelegate* view_delegate)
     : app_list_main_view_(app_list_main_view),
       model_(NULL),
       view_delegate_(view_delegate),
+      results_view_(
+          new SearchResultListView(app_list_main_view, view_delegate)),
       instant_container_(new views::View),
-      tiles_container_(new views::View) {
-  SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kVertical, 0, kTopMargin, kInstantContainerSpacing));
-
+      tiles_container_(new views::View),
+      show_state_(SHOW_START_PAGE) {
   // The view containing the start page WebContents and the BarPlaceholder.
   AddChildView(instant_container_);
   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_container_->SetLayoutManager(instant_layout_manager);
 
   views::View* web_view = view_delegate->CreateStartPageWebView(
       gfx::Size(kWebViewWidth, kWebViewHeight));
   if (web_view)
     instant_container_->AddChildView(web_view);
   instant_container_->AddChildView(new BarPlaceholderButton(this));
 
+  // The view containing the search results.
+  AddChildView(results_view_);
+
   // The view containing the start page tiles.
   AddChildView(tiles_container_);
   views::BoxLayout* tiles_layout_manager =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, kTileSpacing);
   tiles_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   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);
   }
 
   SetModel(view_delegate_->GetModel());
   view_delegate_->AddObserver(this);
 }
 
 StartPageView::~StartPageView() {
   view_delegate_->RemoveObserver(this);
   if (model_)
     model_->RemoveObserver(this);
 }
 
 void StartPageView::SetModel(AppListModel* model) {
   DCHECK(model);
   if (model_)
     model_->RemoveObserver(this);
   model_ = model;
   model_->AddObserver(this);
+  results_view_->SetResults(model_->results());
   Reset();
 }
 
 void StartPageView::Reset() {
-  instant_container_->SetVisible(true);
+  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);
   }
+}
 
-  Layout();
+void StartPageView::ShowSearchResults() {
+  SetShowState(SHOW_SEARCH_RESULTS);
+}
+
+void StartPageView::SetShowState(ShowState show_state) {
+  if (show_state_ == show_state)

[tapted, 2014/06/12 05:43:28]

Note I think this will early exit when Reset() is called from the constructor
(via SetModel), but at a glance that looks OK to do.. exccept maybe for a
missing results_view_->SetVisible(false)?

[calamity, 2014/06/12 07:09:37]

Yep. That is completely necessary. Moved that up.

+    return;
+
+  show_state_ = show_state;
+
+  results_view_->UpdateAutoLaunchState();
+  if (show_state == SHOW_SEARCH_RESULTS)
+    results_view_->SetSelectedIndex(0);
+
+  instant_container_->SetVisible(show_state == SHOW_START_PAGE);
+  results_view_->SetVisible(show_state == SHOW_SEARCH_RESULTS);
+}
+
+bool StartPageView::IsShowingSearchResults() const {
+  return show_state_ == SHOW_SEARCH_RESULTS;
+}
+
+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::ButtonPressed(views::Button* sender,
                                   const ui::Event& event) {
   app_list_main_view_->OnStartPageSearchButtonPressed();
-  instant_container_->SetVisible(false);
 }
 
 void StartPageView::OnProfilesChanged() {
   SetModel(view_delegate_->GetModel());
 }
 
 void StartPageView::OnAppListModelStatusChanged() {
   Reset();
 }
 
 void StartPageView::OnAppListItemAdded(AppListItem* item) {
   Reset();
 }
 
 void StartPageView::OnAppListItemDeleted() {
   Reset();
 }
 
 void StartPageView::OnAppListItemUpdated(AppListItem* item) {
   Reset();
 }
 
 }  // namespace app_list