Implement app list folder management page UI.

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_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_grid_view.h"
 #include "ui/app_list/views/search_result_list_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 {
 
-const int kPreferredIconDimension = 48;
-
 // Indexes of interesting views in ViewModel of ContentsView.
 const int kIndexAppsGrid = 0;
 const int kIndexSearchResults = 1;
+const int kIndexFolderContent = 2;
 
 const int kMinMouseWheelToSwitchPage = 20;
 const int kMinScrollToSwitchPage = 20;
 const int kMinHorizVelocityToSwitchPage = 800;
 
 const double kFinishTransitionThreshold = 0.33;
 
 // Helpers to get certain child view from |model|.
 AppsGridView* GetAppsGridView(views::ViewModel* model) {
   return static_cast<AppsGridView*>(model->view_at(kIndexAppsGrid));
 }
 
 SearchResultListView* GetSearchResultListView(views::ViewModel* model) {
   return static_cast<SearchResultListView*>(
       model->view_at(kIndexSearchResults));
 }
 
+AppListFolderView* GetAppListFolderView(views::ViewModel* model) {
+  return static_cast<AppListFolderView*>(model->view_at(kIndexFolderContent));
+}
+
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            PaginationModel* pagination_model,
                            AppListModel* model,
                            content::WebContents* start_page_contents)
     : show_state_(SHOW_APPS),
+      previous_show_state_(show_state_),
       pagination_model_(pagination_model),
       view_model_(new views::ViewModel),
       bounds_animator_(new views::BoundsAnimator(this)) {
   DCHECK(model);
   pagination_model_->SetTransitionDurations(
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
   apps_grid_view_ = new AppsGridView(
       app_list_main_view, pagination_model, start_page_contents);
   apps_grid_view_->SetLayout(kPreferredIconDimension,
                              kPreferredCols,
                              kPreferredRows);
   AddChildView(apps_grid_view_);
   view_model_->Add(apps_grid_view_, kIndexAppsGrid);
 
   SearchResultListView* search_results_view = new SearchResultListView(
       app_list_main_view);
   AddChildView(search_results_view);
   view_model_->Add(search_results_view, kIndexSearchResults);
 
   GetAppsGridView(view_model_.get())->SetModel(model);
+  if (model)
+    GetAppsGridView(view_model_.get())->SetApps(model->apps());
   GetSearchResultListView(view_model_.get())->SetResults(model->results());
+
+  AppListFolderView* folder_view = new AppListFolderView(
+      this,
+      model,
+      app_list_main_view,
+      pagination_model,
+      start_page_contents);
+  AddChildView(folder_view);
+  view_model_->Add(folder_view, kIndexFolderContent);

[xiyuan, 2013/10/17 23:50:30]

Suggest to put folder view and root grid view into another container view. Add
the container view to ContentsView and we do the root grid and folder switching
inside the container.

[jennyz, 2013/10/18 22:09:02]

Added a new AppsContainerView to achieve the above.

 }
 
 ContentsView::~ContentsView() {
 }
 
 void ContentsView::CancelDrag() {
   if (apps_grid_view_ && apps_grid_view_->has_dragged_view())
     apps_grid_view_->EndDrag(true);
 }
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_grid_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;
 
+  previous_show_state_ = show_state_;
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
   if (show_state_ == SHOW_SEARCH_RESULTS) {
     // TODO(xiyuan): Highlight default match instead of the first.
     SearchResultListView* results_view =
         GetSearchResultListView(view_model_.get());
     if (results_view->visible())
       results_view->SetSelectedIndex(0);
   }
 
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect grid_frame(rect);
   gfx::Rect results_frame(rect);
+  gfx::Rect folder_frame(rect);
 
   // Offsets apps grid and result list based on |show_state_|.
   // SearchResultListView is on top of apps grid. Visible view is left in
   // visible area and invisible ones is put out of the visible area.
   int contents_area_height = rect.height();
   switch (show_state_) {
     case SHOW_APPS:
       results_frame.Offset(0, -contents_area_height);
+      folder_frame.Offset(0, -contents_area_height);
       break;
     case SHOW_SEARCH_RESULTS:
       grid_frame.Offset(0, contents_area_height);
+      folder_frame.Offset(0, -contents_area_height);
+      break;
+    case SHOW_FOLDER_CONTENT:
+      results_frame.Offset(0, -contents_area_height);
+      grid_frame.Offset(0, contents_area_height);
       break;
     default:
       NOTREACHED() << "Unknown show_state_ " << show_state_;
       break;
   }
 
   view_model_->set_ideal_bounds(kIndexAppsGrid, grid_frame);
   view_model_->set_ideal_bounds(kIndexSearchResults, results_frame);
+  view_model_->set_ideal_bounds(kIndexFolderContent, folder_frame);
 }
 
 void ContentsView::AnimateToIdealBounds() {
   CalculateIdealBounds();
   for (int i = 0; i < view_model_->view_size(); ++i) {
     bounds_animator_->AnimateViewTo(view_model_->view_at(i),
                                     view_model_->ideal_bounds(i));
   }
 }
 
 void ContentsView::ShowSearchResults(bool show) {
-  SetShowState(show ? SHOW_SEARCH_RESULTS : SHOW_APPS);
+  SetShowState(show ? SHOW_SEARCH_RESULTS : previous_show_state_);
+}
+
+void ContentsView::ShowFolderContent(AppListFolderItem* item) {
+  GetAppListFolderView(view_model_.get())->SetAppListFolderItem(item);
+  SetShowState(SHOW_FOLDER_CONTENT);
+}
+
+void ContentsView::ShowApps() {
+  SetShowState(SHOW_APPS);
 }
 
 void ContentsView::Prerender() {
   const int selected_page = std::max(0, pagination_model_->selected_page());
   GetAppsGridView(view_model_.get())->Prerender(selected_page);
 }
 
 gfx::Size ContentsView::GetPreferredSize() {
   const gfx::Size grid_size =
       GetAppsGridView(view_model_.get())->GetPreferredSize();
   const gfx::Size results_size =
       GetSearchResultListView(view_model_.get())->GetPreferredSize();
 
   int width = std::max(grid_size.width(), results_size.width());
   int height = std::max(grid_size.height(), results_size.height());
   return gfx::Size(width, height);
 }
 
 void ContentsView::Layout() {
   CalculateIdealBounds();
   views::ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
   switch (show_state_) {
     case SHOW_APPS:
       return GetAppsGridView(view_model_.get())->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
       return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
+    case SHOW_FOLDER_CONTENT:
+      return GetAppListFolderView(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