Change content view switching animation for experimental app launcher.

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_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_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"
@@ skipping 81 matching lines @@
   results_view->UpdateAutoLaunchState();
 
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    int incoming_view = 0;

[tapted, 2014/03/05 07:37:17]

nit: incoming_view_index or incoming_index

[calamity, 2014/03/07 00:30:51]

Done.

+    switch (show_state_) {
+      case SHOW_APPS:
+        incoming_view = kIndexAppsContainer;
+        break;
+      case SHOW_SEARCH_RESULTS:
+        incoming_view = kIndexSearchResults;
+        break;
+      default:
+        NOTREACHED();
+    }
+
+    gfx::Rect incoming_target(GetContentsBounds());

[tapted, 2014/03/05 07:37:17]

nit: initialise these both with |rect|?

[calamity, 2014/03/07 00:30:51]

Done.

+    gfx::Rect outgoing_target(GetContentsBounds());
+    outgoing_target.set_y(-outgoing_target.height());
+
+    for (int i = 0; i < view_model_->view_size(); ++i) {
+      views::View* view = view_model_->view_at(i);

[tapted, 2014/03/05 07:37:17]

|view| unused?

[calamity, 2014/03/07 00:30:51]

Done.

+      view_model_->set_ideal_bounds(i, i == incoming_view ? incoming_target
+                                                          : outgoing_target);
+    }
+    return;
+  }
+
   gfx::Rect container_frame(rect);
   gfx::Rect results_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);
@@ skipping 132 matching lines @@
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
                                             true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list