Commit 79843224 authored by calamity@chromium.org's avatar calamity@chromium.org

Change content view switching animation for experimental app launcher.

This CL implements a different animation for the experimental app list.
The change will allow more views to be added with a default animation
when switching the contents view.

BUG=349727

Review URL: https://codereview.chromium.org/187083004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255812 0039d316-1c4b-4281-b951-d872f2087c98
parent c2520bb1
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "ui/app_list/app_list_constants.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/app_list_view_delegate.h"
#include "ui/app_list/pagination_model.h" #include "ui/app_list/pagination_model.h"
#include "ui/app_list/views/app_list_main_view.h" #include "ui/app_list/views/app_list_main_view.h"
...@@ -109,6 +110,31 @@ void ContentsView::CalculateIdealBounds() { ...@@ -109,6 +110,31 @@ void ContentsView::CalculateIdealBounds() {
if (rect.IsEmpty()) if (rect.IsEmpty())
return; 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 container_frame(rect);
gfx::Rect results_frame(rect); gfx::Rect results_frame(rect);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment