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"

[xiyuan, 2014/05/08 16:17:48]

nit: do we still need this?

[calamity, 2014/05/09 07:09:39]

Done.

 #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));
 }
 
+StartPageView* GetStartPageView(views::ViewModel* model) {
+  return static_cast<StartPageView*>(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()
@@ skipping 18 matching lines @@
 }
 
 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.

[xiyuan, 2014/05/08 16:17:48]

nit: update comment. It's more like "Notify parent AppListMainView about show
state change".

[calamity, 2014/05/09 07:09:39]

Done.

+  app_list_main_view_->OnContentsViewShowStateChanged(show_state_);

[xiyuan, 2014/05/08 16:17:48]

nit: Slightly prefer to add a show_state() accessor than passing it in here.

[calamity, 2014/05/09 07:09:39]

Done.

+
+  if (show_state_ == SHOW_START_PAGE)
+    GetStartPageView(view_model_.get())->Reset();
+
   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