| Index: ui/app_list/pagination_model.cc
|
| diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
|
| index fcd1d46687aa179e85eb8d3adc2cff2d3a2adba0..9d8797d718bb25b8d110f8f96b619d83dc3fa0c6 100644
|
| --- a/ui/app_list/pagination_model.cc
|
| +++ b/ui/app_list/pagination_model.cc
|
| @@ -41,7 +41,7 @@ void PaginationModel::SelectPage(int page, bool animate) {
|
| // -1 and |total_pages_| are valid target page for animation.
|
| DCHECK(page >= -1 && page <= total_pages_);
|
|
|
| - if (!transition_animation_.get()) {
|
| + if (!transition_animation_) {
|
| if (page == selected_page_)
|
| return;
|
|
|
| @@ -166,7 +166,7 @@ void PaginationModel::EndScroll(bool cancel) {
|
|
|
| bool PaginationModel::IsRevertingCurrentTransition() const {
|
| // Use !IsShowing() so that we return true at the end of hide animation.
|
| - return transition_animation_.get() && !transition_animation_->IsShowing();
|
| + return transition_animation_ && !transition_animation_->IsShowing();
|
| }
|
|
|
| void PaginationModel::AddObserver(PaginationModelObserver* observer) {
|
| @@ -192,7 +192,7 @@ int PaginationModel::CalculateTargetPage(int delta) const {
|
| DCHECK_GT(total_pages_, 0);
|
|
|
| int current_page = selected_page_;
|
| - if (transition_animation_.get() && transition_animation_->IsShowing()) {
|
| + if (transition_animation_ && transition_animation_->IsShowing()) {
|
| current_page = pending_selected_page_ >= 0 ?
|
| pending_selected_page_ : transition_.target_page;
|
| }
|
|
|