Fix animation issues due to inconsistent ways of dismissing the view.

Bug: 763147
Change-Id: I208cb359494aec7c49faa1ced7586532f96b4708
Reviewed-on: https://chromium-review.googlesource.com/656757
Commit-Queue: Maajid <maajid@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501542}

ui/app_list/views/app_list_view.cc

@@ -309,6 +309,13 @@ void AppListView::ShowWhenReady() {
   app_list_main_view_->ShowAppListWhenReady();
 }
 
+void AppListView::Dismiss() {
+  app_list_main_view_->Close();
+  delegate_->Dismiss();
+  SetState(CLOSED);
+  GetWidget()->Deactivate();
+}
+
 void AppListView::UpdateBounds() {
   // if the AppListView is a bubble
   if (!is_fullscreen_app_list_enabled_)
@@ -562,7 +569,7 @@ void AppListView::HandleClickOrTap(ui::LocatedEvent* event) {
   }
 
   if (!search_box_view_->is_search_box_active()) {
-    SetState(CLOSED);
+    Dismiss();
     return;
   }
 
@@ -616,7 +623,7 @@ void AppListView::EndDrag(const gfx::Point& location) {
         case HALF:
         case FULLSCREEN_SEARCH:
         case FULLSCREEN_ALL_APPS:
-          SetState(CLOSED);
+          Dismiss();
           break;
         case CLOSED:
           NOTREACHED();
@@ -676,7 +683,7 @@ void AppListView::EndDrag(const gfx::Point& location) {
     // If the drag ended near the bezel, close the app list and return early.
     if (location_y_in_current_display >=
         (display_height - kAppListBezelMargin)) {
-      SetState(CLOSED);
+      Dismiss();
       return;
     }
     switch (app_list_state_) {
@@ -688,7 +695,7 @@ void AppListView::EndDrag(const gfx::Point& location) {
         break;
       case FULLSCREEN_SEARCH:
         if (std::abs(drag_delta) > app_list_threshold)
-          SetState(CLOSED);
+          Dismiss();
         else
           SetState(app_list_state_);
         break;
@@ -706,7 +713,7 @@ void AppListView::EndDrag(const gfx::Point& location) {
             UMA_HISTOGRAM_ENUMERATION(kAppListPeekingToFullscreenHistogram,
                                       kSwipe, kMaxPeekingToFullscreen);
           } else {
-            SetState(CLOSED);
+            Dismiss();
           }
         } else {
           SetState(app_list_state_);
@@ -989,13 +996,7 @@ bool AppListView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // If the ContentsView does not handle the back action, then this is the
   // top level, so we close the app list.
   if (!app_list_main_view_->contents_view()->Back()) {
-    if (is_fullscreen_app_list_enabled_) {
-      SetState(CLOSED);
-    } else {
-      app_list_main_view_->Close();
-      delegate_->Dismiss();
-    }
-    GetWidget()->Deactivate();
+    Dismiss();
   }
 
   // Don't let DialogClientView handle the accelerator.
@@ -1153,8 +1154,6 @@ void AppListView::SetState(AppListState new_state) {
         case PEEKING:
         case FULLSCREEN_ALL_APPS:
         case FULLSCREEN_SEARCH:
-          delegate_->Dismiss();
-          app_list_main_view_->Close();
           break;
       }
   }
@@ -1162,7 +1161,9 @@ void AppListView::SetState(AppListState new_state) {
   RecordStateTransitionForUma(new_state_override);
   model_->SetStateFullscreen(new_state_override);
   app_list_state_ = new_state_override;
-
+  if (new_state_override == CLOSED) {
+    return;
+  }
   // Updates the visibility of app list items according to the change of
   // |app_list_state_|.
   app_list_main_view_->contents_view()

ui/app_list/views/app_list_view.h

@@ -116,6 +116,9 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView,
   // timer to show the UI when a maximum allowed wait time has expired.
   void ShowWhenReady();
 
+  // Dismisses the UI, cleans up and sets the state to CLOSED.
+  void Dismiss();
+
   void UpdateBounds();
 
   // Enables/disables a semi-transparent overlay over the app list (good for

ui/app_list/views/contents_view.cc

@@ -451,7 +451,7 @@ bool ContentsView::Back() {
         apps_container_view_->app_list_folder_view()->CloseFolderPage();
       } else {
         is_fullscreen_app_list_enabled_
-            ? app_list_view_->SetState(AppListView::CLOSED)
+            ? app_list_view_->Dismiss()
             : SetActiveState(AppListModel::STATE_START);
       }
       break;