Make app list ContentsView scroll vertically in experimental app list.

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 <vector>
 
 #include "base/logging.h"
@@ skipping 197 matching lines @@
     if (pagination_model_.is_valid_page(transition.target_page)) {
       target_page = transition.target_page;
       progress = transition.progress;
     }
   }
 
   gfx::Rect incoming_target(rect);
   gfx::Rect outgoing_target(rect);
   int dir = target_page > current_page ? -1 : 1;
 
-  if (app_list::switches::IsExperimentalAppListEnabled()) {
-    // The experimental app list transitions horizontally.
-    int page_width = rect.width();
-    int transition_offset = progress * page_width * dir;
+  // The normal app list transitions vertically.

[Matt Giuca, 2014/08/26 03:21:52]

Replace this comment:
// Pages transition vertically.

[calamity, 2014/08/26 03:23:50]

Done.

+  int page_height = rect.height();
+  int transition_offset = progress * page_height * dir;
 
-    outgoing_target.set_x(transition_offset);
-    incoming_target.set_x(dir < 0 ? transition_offset + page_width
-                                  : transition_offset - page_width);
-  } else {
-    // The normal app list transitions vertically.
-    int page_height = rect.height();
-    int transition_offset = progress * page_height * dir;
-
-    outgoing_target.set_y(transition_offset);
-    incoming_target.set_y(dir < 0 ? transition_offset + page_height
-                                  : transition_offset - page_height);
-  }
+  outgoing_target.set_y(transition_offset);
+  incoming_target.set_y(dir < 0 ? transition_offset + page_height
+                                : transition_offset - page_height);
 
   view_model_->view_at(current_page)->SetBoundsRect(outgoing_target);
   view_model_->view_at(target_page)->SetBoundsRect(incoming_target);
 }
 
 PaginationModel* ContentsView::GetAppsPaginationModel() {
   return apps_container_view_->apps_grid_view()->pagination_model();
 }
 
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
@@ skipping 152 matching lines @@
   if (std::abs(offset) > kMinScrollToSwitchPage) {
     if (!GetAppsPaginationModel()->has_transition()) {
       GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list