| Index: ui/app_list/views/contents_view.cc
|
| diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
|
| index 1921aca0dc0872836b24e862c27610f887bd88ea..0121cf6d8da06d12f653693a06fd59dd3310a50a 100644
|
| --- a/ui/app_list/views/contents_view.cc
|
| +++ b/ui/app_list/views/contents_view.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #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"
|
| @@ -109,6 +110,31 @@ void ContentsView::CalculateIdealBounds() {
|
| if (rect.IsEmpty())
|
| return;
|
|
|
| + if (app_list::switches::IsExperimentalAppListEnabled()) {
|
| + int incoming_view_index = 0;
|
| + switch (show_state_) {
|
| + case SHOW_APPS:
|
| + incoming_view_index = kIndexAppsContainer;
|
| + break;
|
| + case SHOW_SEARCH_RESULTS:
|
| + incoming_view_index = kIndexSearchResults;
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + }
|
| +
|
| + gfx::Rect incoming_target(rect);
|
| + gfx::Rect outgoing_target(rect);
|
| + outgoing_target.set_y(-outgoing_target.height());
|
| +
|
| + for (int i = 0; i < view_model_->view_size(); ++i) {
|
| + view_model_->set_ideal_bounds(i,
|
| + i == incoming_view_index ? incoming_target
|
| + : outgoing_target);
|
| + }
|
| + return;
|
| + }
|
| +
|
| gfx::Rect container_frame(rect);
|
| gfx::Rect results_frame(rect);
|
|
|
|
|