Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: ui/app_list/pagination_model.cc

Issue 13926010: ui/app_list: Remove unnecessary scoped_ptr ".get()" calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698