Reset the app list when it is shown on Windows and Linux.

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 <vector>
 
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_switches.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),
+      activated_folder_view_(NULL),
       top_icon_animation_pending_count_(0) {
   apps_grid_view_ = new AppsGridView(
       app_list_main_view, pagination_model, start_page_contents);
   int cols = kPreferredCols;
   int rows = kPreferredRows;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       app_list::switches::kEnableExperimentalAppList)) {
     cols = kExperimentalPreferredCols;
     rows = kExperimentalPreferredRows;
   }
   apps_grid_view_->SetLayout(kPreferredIconDimension, cols, rows);
   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());
-  SetShowState(SHOW_APPS,
-               false);  /* show apps without animation */
+  ResetForShow();

[jennyz, 2014/03/27 18:35:54]

We don't need to ResetForShow in the constructor. The show_state_ is default to
SHOW_APPS.

[calamity, 2014/03/28 03:43:27]

Done. Note that this removes the SetState() call that was previously there.

 }
 
 AppsContainerView::~AppsContainerView() {
 }
 
 void AppsContainerView::ShowActiveFolder(AppListFolderItem* folder_item) {
+  if (activated_folder_view_)
+    return;
+
   app_list_folder_view_->SetAppListFolderItem(folder_item);
   SetShowState(SHOW_ACTIVE_FOLDER, false);
 
   CreateViewsForFolderTopItemsAnimation(folder_item, true);
 }
 
 void AppsContainerView::ShowApps(AppListFolderItem* folder_item) {
   PrepareToShowApps(folder_item);
   SetShowState(SHOW_APPS,
                true);  /* show apps with animation */
 }
 
+void AppsContainerView::ResetForShow() {
+  SetShowState(SHOW_APPS, false /* show apps without animation */);
+  folder_background_view_->UpdateFolderContainerBubble(
+      FolderBackgroundView::NO_BUBBLE);
+}
+
 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);
@@ skipping 38 matching lines @@
 
 void AppsContainerView::OnTopIconAnimationsComplete() {
   --top_icon_animation_pending_count_;
 
   if (!top_icon_animation_pending_count_) {
     // Clean up the transitional views used for top item icon animation.
     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);
+        activated_folder_view_) {
+      activated_folder_view_->SetVisible(true);
+      activated_folder_view_ = NULL;
     }
   }
 }
 
 void AppsContainerView::SetShowState(ShowState show_state,
                                      bool show_apps_with_animation) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
 
   switch (show_state_) {
     case SHOW_APPS:
       folder_background_view_->SetVisible(false);
       if (show_apps_with_animation) {
         app_list_folder_view_->ScheduleShowHideAnimation(false, false);
         apps_grid_view_->ScheduleShowHideAnimation(true);
       } else {
+        if (activated_folder_view_) {
+          activated_folder_view_->SetVisible(true);
+          activated_folder_view_ = NULL;
+        }
         app_list_folder_view_->HideViewImmediately();
+        apps_grid_view_->layer()->SetOpacity(1.0f);
         apps_grid_view_->SetVisible(true);
       }
       break;
     case SHOW_ACTIVE_FOLDER:
       folder_background_view_->SetVisible(true);
       apps_grid_view_->ScheduleShowHideAnimation(false);
       app_list_folder_view_->ScheduleShowHideAnimation(true, false);
       break;
     case SHOW_ITEM_REPARENT:
       folder_background_view_->SetVisible(false);
@@ skipping 41 matching lines @@
             app_list_folder_view_->GetItemIconBoundsAt(i)));
     static_cast<TopIconAnimationView*>(top_icon_views_[i])->TransformView();
   }
 }
 
 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);
+  if (apps_grid_view_->activated_item_view()) {
+    activated_folder_view_ = apps_grid_view_->activated_item_view();

[jennyz, 2014/03/27 18:35:54]

Cache activated_folder_view_ seems dangerous,the item could go away due to sync
and the raw pointer then became invalid, lead to crash. We can find a better way
to track if the folder open/close animation completes and handle the case
better. I don't see the scenario of crbug.com/357099 happening on chromeos, I
wonder if the animation behaves differently on windows. Also, chromeos always
destroy and create the launcher bubble when close/open launcher, windows only
hide/show the UI, so that could make the difference in UI too.

[calamity, 2014/03/28 03:43:27]

This does happen on ChromeOS (checked on latest canary). The case is going into
a folder, leaving the folder and entering a different folder; not closing the
launcher, sorry for being unclear.

+    activated_folder_view_->SetVisible(false);
+  }
 }
 
 }  // namespace app_list