App list start page is no longer a SearchResultContainerView.

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/all_apps_tile_item_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_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/search_result_container_view.h"
 #include "ui/app_list/views/search_result_tile_item_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"
 #include "ui/views/widget/widget.h"
 
@@ skipping 28 matching lines @@
   gfx::Size GetPreferredSize() const override { return size_; }
 
  private:
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxSpacerView);
 };
 
 }  // namespace
 
+class StartPageTilesContainer : public SearchResultContainerView {

[Matt Giuca, 2015/02/04 06:07:45]

I think this can go inside the namespace.

[calamity, 2015/02/04 06:46:55]

Nope. Moved it into SPV's private instead.

+ public:
+  explicit StartPageTilesContainer(AllAppsTileItemView* all_apps_button)
+      : all_apps_button_(all_apps_button) {

[Matt Giuca, 2015/02/04 06:07:45]

I'm not a fan of inline methods (inside the class {} block). Please move these
out so they appear just underneath the class.

(That way, if we ever want to move this to its own file, we won't have to
rearrange this at the same time --- something I find myself doing quite a bit.)

[calamity, 2015/02/04 06:46:54]

Done.

+    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);
+    SetLayoutManager(tiles_layout_manager);
+    set_background(
+        views::Background::CreateSolidBackground(kLabelBackgroundColor));
+
+    // Add SearchResultTileItemViews to the container.
+    for (size_t i = 0; i < kNumStartPageTiles; ++i) {
+      SearchResultTileItemView* tile_item = new SearchResultTileItemView();
+      AddChildView(tile_item);
+      tile_item->SetParentBackgroundColor(kLabelBackgroundColor);
+      search_result_tile_views_.push_back(tile_item);
+    }
+
+    // Also add a special "all apps" button to the end of the container.
+    all_apps_button_->UpdateIcon();
+    all_apps_button_->SetParentBackgroundColor(kLabelBackgroundColor);
+    AddChildView(all_apps_button_);
+  }
+  ~StartPageTilesContainer() override {}
+
+  TileItemView* GetTileItemView(size_t index) {
+    DCHECK_GT(kNumStartPageTiles + 1, index);
+    if (index == kNumStartPageTiles)
+      return all_apps_button_;
+
+    return search_result_tile_views_[index];
+  }
+
+  const std::vector<SearchResultTileItemView*>& tile_views() const {
+    return search_result_tile_views_;
+  }
+
+  AllAppsTileItemView* all_apps_button() { return all_apps_button_; }
+
+  // Overridden from SearchResultContainerView:
+  int Update() override {
+    std::vector<SearchResult*> display_results =
+        AppListModel::FilterSearchResultsByDisplayType(
+            results(), SearchResult::DISPLAY_RECOMMENDATION,
+            kNumStartPageTiles);
+
+    // Update the tile item results.
+    for (size_t i = 0; i < search_result_tile_views_.size(); ++i) {
+      SearchResult* item = NULL;

[Matt Giuca, 2015/02/04 06:07:45]

nullptr

[calamity, 2015/02/04 06:46:55]

Done.

+      if (i < display_results.size())
+        item = display_results[i];
+      search_result_tile_views_[i]->SetSearchResult(item);
+    }
+
+    Layout();
+    parent()->Layout();
+    // Add 1 to the results size to account for the all apps button.
+    return display_results.size() + 1;
+  }
+
+  void UpdateSelectedIndex(int old_selected, int new_selected) override {
+    if (old_selected >= 0)
+      GetTileItemView(old_selected)->SetSelected(false);
+
+    if (new_selected >= 0)
+      GetTileItemView(new_selected)->SetSelected(true);
+  }
+
+  void OnContainerSelected(bool from_bottom) override {}
+
+ private:
+  std::vector<SearchResultTileItemView*> search_result_tile_views_;
+  AllAppsTileItemView* all_apps_button_;
+
+  DISALLOW_COPY_AND_ASSIGN(StartPageTilesContainer);
+};
+
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
                              AppListViewDelegate* view_delegate)
     : app_list_main_view_(app_list_main_view),
       view_delegate_(view_delegate),
       search_box_spacer_view_(new SearchBoxSpacerView(
           app_list_main_view->search_box_view()->GetPreferredSize())),
       instant_container_(new views::View),
-      tiles_container_(new views::View) {
+      tiles_container_(nullptr) {

[Matt Giuca, 2015/02/04 06:07:45]

Any reason you can't do new StartPageTilesContainer here? (Like
search_box_spacer_view).

[calamity, 2015/02/04 06:46:54]

It's BIG. Done.

   // The view containing the start page WebContents and SearchBoxSpacerView.
   InitInstantContainer();
   AddChildView(instant_container_);
 
   // The view containing the start page tiles.
-  InitTilesContainer();
+  tiles_container_ = new StartPageTilesContainer(new AllAppsTileItemView(
+      app_list_main_view_->contents_view(),
+      view_delegate_->GetModel()->top_level_item_list()));
   AddChildView(tiles_container_);
 
-  SetResults(view_delegate_->GetModel()->results());
+  tiles_container_->SetResults(view_delegate_->GetModel()->results());
   Reset();
 }
 
 StartPageView::~StartPageView() {
 }
 
 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(0, 0, kSearchBoxAndTilesSpacing, 0));
   instant_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   instant_layout_manager->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   instant_container_->SetLayoutManager(instant_layout_manager);
 
   views::View* web_view = view_delegate_->CreateStartPageWebView(
       gfx::Size(kWebViewWidth, kWebViewHeight));
   if (web_view) {
     web_view->SetFocusable(false);
     instant_container_->AddChildView(web_view);
   }
 
   instant_container_->AddChildView(search_box_spacer_view_);
 }
 
-void StartPageView::InitTilesContainer() {
-  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);
-  tiles_container_->set_background(
-      views::Background::CreateSolidBackground(kLabelBackgroundColor));
-
-  // Add SearchResultTileItemViews to the container.
-  for (size_t i = 0; i < kNumStartPageTiles; ++i) {
-    SearchResultTileItemView* tile_item = new SearchResultTileItemView();
-    tiles_container_->AddChildView(tile_item);
-    tile_item->SetParentBackgroundColor(kLabelBackgroundColor);
-    search_result_tile_views_.push_back(tile_item);
-  }
-
-  // Also add a special "all apps" button to the end of the container.
-  all_apps_button_ = new AllAppsTileItemView(
-      app_list_main_view_->contents_view(),
-      view_delegate_->GetModel()->top_level_item_list());
-  all_apps_button_->UpdateIcon();
-  all_apps_button_->SetParentBackgroundColor(kLabelBackgroundColor);
-  tiles_container_->AddChildView(all_apps_button_);
-}
-
 void StartPageView::Reset() {
-  Update();
+  tiles_container_->Update();
 }
 
 void StartPageView::UpdateForTesting() {
-  Update();
+  tiles_container_->Update();
+}
+
+const std::vector<SearchResultTileItemView*>& StartPageView::tile_views()
+    const {
+  return tiles_container_->tile_views();
 }
 
 TileItemView* StartPageView::all_apps_button() const {
-  return all_apps_button_;
+  return tiles_container_->all_apps_button();
 }
 
 void StartPageView::OnShow() {
   DCHECK(app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone());
   UpdateCustomPageClickzoneVisibility();
-  ClearSelectedIndex();
+  tiles_container_->ClearSelectedIndex();
 }
 
 void StartPageView::OnHide() {
   DCHECK(
       !app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone());
   UpdateCustomPageClickzoneVisibility();
 }
 
 void StartPageView::Layout() {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(instant_container_->GetHeightForWidth(bounds.width()));
   instant_container_->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);
 }
 
 bool StartPageView::OnKeyPressed(const ui::KeyEvent& event) {
-  if (selected_index() >= 0 &&
-      tiles_container_->child_at(selected_index())->OnKeyPressed(event))
+  int selected_index = tiles_container_->selected_index();
+  if (selected_index >= 0 &&
+      tiles_container_->child_at(selected_index)->OnKeyPressed(event))
     return true;
 
   int dir = 0;
   switch (event.key_code()) {
     case ui::VKEY_LEFT:
       dir = -1;
       break;
     case ui::VKEY_RIGHT:
       dir = 1;
       break;
     case ui::VKEY_DOWN:
       // Down selects the first tile if nothing is selected.
-      if (!IsValidSelectionIndex(selected_index()))
+      if (!tiles_container_->IsValidSelectionIndex(selected_index))
         dir = 1;
       break;
     case ui::VKEY_TAB:
       dir = event.IsShiftDown() ? -1 : 1;
       break;
     default:
       break;
   }
 
   if (dir == 0)
     return false;
 
-  if (!IsValidSelectionIndex(selected_index())) {
-    SetSelectedIndex(dir == -1 ? num_results() - 1 : 0);
+  if (!tiles_container_->IsValidSelectionIndex(selected_index)) {
+    tiles_container_->SetSelectedIndex(
+        dir == -1 ? tiles_container_->num_results() - 1 : 0);
     return true;
   }
 
-  int selection_index = selected_index() + dir;
-  if (IsValidSelectionIndex(selection_index)) {
-    SetSelectedIndex(selection_index);
+  int selection_index = selected_index + dir;
+  if (tiles_container_->IsValidSelectionIndex(selection_index)) {
+    tiles_container_->SetSelectedIndex(selection_index);
     return true;
   }
 
   return false;
 }
 
-void StartPageView::OnContainerSelected(bool from_bottom) {
-}
-
 gfx::Rect StartPageView::GetSearchBoxBounds() const {
   return search_box_spacer_view_->bounds();
 }
 
 void StartPageView::UpdateCustomPageClickzoneVisibility() {
   // This can get called before InitWidgets(), so we cannot guarantee that
   // custom_page_clickzone_ will not be null.
   views::Widget* custom_page_clickzone =
       app_list_main_view_->GetCustomPageClickzone();
   if (!custom_page_clickzone)
     return;
 
   if (app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone()) {
     custom_page_clickzone->ShowInactive();
     return;
   }
 
   custom_page_clickzone->Hide();
 }
 
-int StartPageView::Update() {
-  std::vector<SearchResult*> display_results =
-      AppListModel::FilterSearchResultsByDisplayType(
-          results(), SearchResult::DISPLAY_RECOMMENDATION, kNumStartPageTiles);
-
-  // Update the tile item results.
-  for (size_t i = 0; i < search_result_tile_views_.size(); ++i) {
-    SearchResult* item = NULL;
-    if (i < display_results.size())
-      item = display_results[i];
-    search_result_tile_views_[i]->SetSearchResult(item);
-  }
-
-  tiles_container_->Layout();
-  Layout();
-  // Add 1 to the results size to account for the all apps button.
-  return display_results.size() + 1;
-}
-
-void StartPageView::UpdateSelectedIndex(int old_selected, int new_selected) {
-  if (old_selected >= 0)
-    GetTileItemView(old_selected)->SetSelected(false);
-
-  if (new_selected >= 0)
-    GetTileItemView(new_selected)->SetSelected(true);
-}
-
 TileItemView* StartPageView::GetTileItemView(size_t index) {
-  DCHECK_GT(kNumStartPageTiles + 1, index);
-  if (index == kNumStartPageTiles)
-    return all_apps_button_;
-
-  return search_result_tile_views_[index];
+  return tiles_container_->GetTileItemView(index);
 }
 
 }  // namespace app_list