Add a skeleton Start Page to the experimental app list.

ui/app_list/views/contents_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/contents_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_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/start_page_view.h"
 #include "ui/events/event.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace app_list {
 
 namespace {
 
 // Indexes of interesting views in ViewModel of ContentsView.
 const int kIndexAppsContainer = 0;
 const int kIndexSearchResults = 1;
+const int kIndexStartPage = 2;
 
 const int kMinMouseWheelToSwitchPage = 20;
 const int kMinScrollToSwitchPage = 20;
 const int kMinHorizVelocityToSwitchPage = 800;
 
 const double kFinishTransitionThreshold = 0.33;
 
 AppsContainerView* GetAppsContainerView(views::ViewModel* model) {
   return static_cast<AppsContainerView*>(model->view_at(kIndexAppsContainer));
 }
 
 SearchResultListView* GetSearchResultListView(views::ViewModel* model) {
   return static_cast<SearchResultListView*>(
       model->view_at(kIndexSearchResults));
 }
 
+SearchResultListView* GetStartPageView(views::ViewModel* model) {
+  return static_cast<SearchResultListView*>(model->view_at(kIndexStartPage));
+}
+
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            PaginationModel* pagination_model,
                            AppListModel* model,
                            AppListViewDelegate* view_delegate)
     : show_state_(SHOW_APPS),
       pagination_model_(pagination_model),
       view_model_(new views::ViewModel),
-      bounds_animator_(new views::BoundsAnimator(this)) {
+      bounds_animator_(new views::BoundsAnimator(this)),
+      app_list_main_view_(app_list_main_view) {
   DCHECK(model);
   pagination_model_->SetTransitionDurations(
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
   apps_container_view_ =
       new AppsContainerView(app_list_main_view, pagination_model, model);
   AddChildView(apps_container_view_);
   view_model_->Add(apps_container_view_, kIndexAppsContainer);
 
   SearchResultListView* search_results_view = new SearchResultListView(
       app_list_main_view, view_delegate);
   AddChildView(search_results_view);
   view_model_->Add(search_results_view, kIndexSearchResults);
 
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    content::WebContents* start_page_contents =
+        view_delegate->GetStartPageContents();
+    StartPageView* start_page_view =
+        new StartPageView(app_list_main_view, start_page_contents);
+    AddChildView(start_page_view);
+    view_model_->Add(start_page_view, kIndexStartPage);
+  }
+
   GetSearchResultListView(view_model_.get())->SetResults(model->results());
 }
 
 ContentsView::~ContentsView() {
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
     apps_container_view_->apps_grid_view()->EndDrag(true);
   if (apps_container_view_->app_list_folder_view()

[tapted, 2014/05/07 08:19:17]

oops - just realised this came in from a rebase, but I commented anyway. My
question was: does this work if the folder UI is disabled via the flag? (e.g. is
app_list_folder_view() guaranteed non-null?)

[xiyuan, 2014/05/07 17:32:16]

My impression is that folder UI views are all created but not functioning when
folder UI is disabled (i.e. no folder is shown in root grid and no way to create
folder). It should be a noop when folder UI is disabled.

[calamity, 2014/05/08 07:46:32]

Yeah, seems to be that way.

           ->items_grid_view()
           ->has_dragged_view()) {
     apps_container_view_->app_list_folder_view()->items_grid_view()->EndDrag(
         true);
   }
 }
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
   SearchResultListView* results_view =
       GetSearchResultListView(view_model_.get());
   // TODO(xiyuan): Highlight default match instead of the first.
   if (show_state_ == SHOW_SEARCH_RESULTS && results_view->visible())
     results_view->SetSelectedIndex(0);
   results_view->UpdateAutoLaunchState();
 
+  // Don't show the search box for the start page.
+  app_list_main_view_->search_box_view()->SetVisible(show_state_ !=

[xiyuan, 2014/05/07 17:32:16]

I prefer to add a method to AppListMainView and keep it there.

e.g.
void AppListMainView::OnContentsViewShowStateChanged() {
  search_box_view()->SetVisible(
    contents_view_->show_state() != ContentsView::SHOW_START_PAGE);
}

[calamity, 2014/05/08 07:46:32]

Done.

+                                                     SHOW_START_PAGE);
+
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     int incoming_view_index = 0;
     switch (show_state_) {
       case SHOW_APPS:
         incoming_view_index = kIndexAppsContainer;
         break;
       case SHOW_SEARCH_RESULTS:
         incoming_view_index = kIndexSearchResults;
         break;
+      case SHOW_START_PAGE:
+        incoming_view_index = kIndexStartPage;
+        break;
       default:
         NOTREACHED();
     }
 
     gfx::Rect incoming_target(rect);
     gfx::Rect outgoing_target(rect);
     outgoing_target.set_y(-outgoing_target.height());
 
     for (int i = 0; i < view_model_->view_size(); ++i) {
       view_model_->set_ideal_bounds(i,
@@ skipping 62 matching lines @@
   CalculateIdealBounds();
   views::ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
   switch (show_state_) {
     case SHOW_APPS:
       return GetAppsContainerView(view_model_.get())->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
       return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
+    case SHOW_START_PAGE:
+      return GetStartPageView(view_model_.get())->OnKeyPressed(event);
     default:
       NOTREACHED() << "Unknown show state " << show_state_;
   }
   return false;
 }
 
 bool ContentsView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (show_state_ != SHOW_APPS)
     return false;
 
@@ skipping 66 matching lines @@
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
                                             true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list