Remove the animation delay for showing the top level apps when user opens app list launcher.

ui/app_list/views/apps_container_view.cc

 // Copyright 2013 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/apps_container_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.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_item_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/folder_background_view.h"
 #include "ui/events/event.h"
 
 namespace app_list {
 
 AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
                                      PaginationModel* pagination_model,
                                      AppListModel* model,
                                      content::WebContents* start_page_contents)
     : model_(model),
       show_state_(SHOW_APPS),
-      top_icon_animation_pending_count_(0) {
+      top_icon_animation_pending_count_(0),
+      show_apps_with_animation_(false) {
   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_);
 
   folder_background_view_ = new FolderBackgroundView();
   AddChildView(folder_background_view_);
 
   app_list_folder_view_ = new AppListFolderView(
       this,
       model,
       app_list_main_view,
       start_page_contents);
   AddChildView(app_list_folder_view_);
 
   apps_grid_view_->SetModel(model_);
   apps_grid_view_->SetItemList(model_->item_list());
 }
 
 AppsContainerView::~AppsContainerView() {
 }
 
 void AppsContainerView::ShowActiveFolder(AppListFolderItem* folder_item) {
   app_list_folder_view_->SetAppListFolderItem(folder_item);
-  SetShowState(SHOW_ACTIVE_FOLDER);
+  SetShowState(SHOW_ACTIVE_FOLDER, false);
 
   CreateViewsForFolderTopItemsAnimation(folder_item, true);
 }
 
 void AppsContainerView::ShowApps(AppListFolderItem* folder_item) {
   PrepareToShowApps(folder_item);
-  SetShowState(SHOW_APPS);
+  SetShowState(SHOW_APPS, true);
 }
 
 void AppsContainerView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_grid_view()->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
   app_list_folder_view()->items_grid_view()->
       SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void AppsContainerView::ReparentFolderItemTransit(
     AppListFolderItem* folder_item) {
   PrepareToShowApps(folder_item);
-  SetShowState(SHOW_ITEM_REPARENT);
+  SetShowState(SHOW_ITEM_REPARENT, false);
 }
 
 gfx::Size AppsContainerView::GetPreferredSize() {
   const gfx::Size grid_size = apps_grid_view_->GetPreferredSize();
   const gfx::Size folder_view_size = app_list_folder_view_->GetPreferredSize();
 
   int width = std::max(grid_size.width(), folder_view_size.width());
   int height = std::max(grid_size.height(), folder_view_size.height());
   return gfx::Size(width, height);
 }
 
 void AppsContainerView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   switch (show_state_) {
     case SHOW_APPS:
       folder_background_view_->SetVisible(false);
-      app_list_folder_view_->ScheduleShowHideAnimation(false, false);
+      if (show_apps_with_animation_)
+        app_list_folder_view_->ScheduleShowHideAnimation(false, false);
+      else
+        app_list_folder_view_->HideViewImmediately();
       apps_grid_view_->SetBoundsRect(rect);
-      apps_grid_view_->ScheduleShowHideAnimation(true);
+      if (show_apps_with_animation_)
+        apps_grid_view_->ScheduleShowHideAnimation(true);
+      else
+        apps_grid_view_->SetVisible(true);

[xiyuan, 2014/02/13 22:53:42]

Can we move the animation and show/hide code into SetShowState? We probably
should not do this in Layout.

[jennyz, 2014/02/13 23:42:59]

Done.

       break;
     case SHOW_ACTIVE_FOLDER:
       folder_background_view_->SetBoundsRect(rect);
       folder_background_view_->SetVisible(true);
       apps_grid_view_->ScheduleShowHideAnimation(false);
       app_list_folder_view_->SetBoundsRect(rect);
       app_list_folder_view_->ScheduleShowHideAnimation(true, false);
       break;
     case SHOW_ITEM_REPARENT:
       folder_background_view_->SetVisible(false);
@@ skipping 22 matching lines @@
     top_icon_views_.clear();
 
     // Show the folder icon when closing the folder.
     if ((show_state_ == SHOW_APPS || show_state_ == SHOW_ITEM_REPARENT) &&
         apps_grid_view_->activated_item_view()) {
       apps_grid_view_->activated_item_view()->SetVisible(true);
     }
   }
 }
 
-void AppsContainerView::SetShowState(ShowState show_state) {
+void AppsContainerView::SetShowState(ShowState show_state,
+                                     bool show_apps_with_animation) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
+  show_apps_with_animation_ = show_apps_with_animation;
   Layout();
 }
 
 Rects AppsContainerView::GetTopItemIconBoundsInActiveFolder() {
   // Get the active folder's icon bounds relative to AppsContainerView.
   AppListItemView* folder_item_view = apps_grid_view_->activated_item_view();
   gfx::Rect to_grid_view = folder_item_view->ConvertRectToParent(
       folder_item_view->GetIconBounds());
   gfx::Rect to_container = apps_grid_view_->ConvertRectToParent(to_grid_view);
 
@@ skipping 27 matching lines @@
 void AppsContainerView::PrepareToShowApps(AppListFolderItem* folder_item) {
   if (folder_item)
     CreateViewsForFolderTopItemsAnimation(folder_item, false);
 
   // Hide the active folder item until the animation completes.
   if (apps_grid_view_->activated_item_view())
     apps_grid_view_->activated_item_view()->SetVisible(false);
 }
 
 }  // namespace app_list