Chromium Code Reviews| 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 997c6c3b5fcdf8fcd32652d635f0a9b2199c5f47..92b84d8c4baa546ebe13931548c4b4a46ba46541 100644 |
| --- a/ui/app_list/views/contents_view.cc |
| +++ b/ui/app_list/views/contents_view.cc |
| @@ -215,23 +215,13 @@ void ContentsView::UpdatePageBounds() { |
| 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; |
| - |
| - 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; |
| + // The normal app list transitions vertically. |
|
Matt Giuca
2014/08/26 03:21:52
Replace this comment:
// Pages transition vertical
calamity
2014/08/26 03:23:50
Done.
|
| + 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); |