| Index: ui/app_list/pagination_model.cc
|
| diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
|
| index e05896c4eb0cc6e525771ae4a8258535060a14d0..12ebbb7af78126de3aff2cd033a4faed9bb9de58 100644
|
| --- a/ui/app_list/pagination_model.cc
|
| +++ b/ui/app_list/pagination_model.cc
|
| @@ -15,7 +15,6 @@ PaginationModel::PaginationModel()
|
| : total_pages_(-1),
|
| selected_page_(-1),
|
| transition_(-1, 0),
|
| - scrolling_(false),
|
| pending_selected_page_(-1),
|
| transition_duration_ms_(0) {
|
| }
|
| @@ -101,7 +100,6 @@ void PaginationModel::SetTransitionDuration(int duration_ms) {
|
| }
|
|
|
| void PaginationModel::StartScroll() {
|
| - scrolling_ = true;
|
| // Cancels current transition animation (if any).
|
| transition_animation_.reset();
|
| }
|
| @@ -133,8 +131,6 @@ void PaginationModel::UpdateScroll(double delta) {
|
| }
|
|
|
| void PaginationModel::EndScroll(bool cancel) {
|
| - scrolling_ = false;
|
| -
|
| if (!has_transition())
|
| return;
|
|
|
| @@ -147,6 +143,10 @@ void PaginationModel::EndScroll(bool cancel) {
|
| transition_animation_->Hide();
|
| }
|
|
|
| +bool PaginationModel::IsRevertingCurrentTransition() const {
|
| + return transition_animation_.get() && transition_animation_->IsClosing();
|
| +}
|
| +
|
| void PaginationModel::AddObserver(PaginationModelObserver* observer) {
|
| observers_.AddObserver(observer);
|
| }
|
|
|