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

Unified Diff: ui/app_list/pagination_model.cc

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, remove dead code in app_list_menu_views, add ui assets Created 7 years, 3 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
Index: ui/app_list/pagination_model.cc
diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
index 2bf69020ab87950d110cba73853c6bbd9bbe135a..e2056bc0491b37b828468fdaec173181407c7f85 100644
--- a/ui/app_list/pagination_model.cc
+++ b/ui/app_list/pagination_model.cc
@@ -32,7 +32,7 @@ void PaginationModel::SetTotalPages(int total_pages) {
if (selected_page_ < 0)
SelectPage(0, false /* animate */);
if (selected_page_ >= total_pages_)
- SelectPage(total_pages_ - 1, false /* animate */);
+ SelectPage(std::max(total_pages_ - 1, 0), false /* animate */);
tapted 2013/09/10 00:29:26 this change looks orthogonal.. is it a bug? Or, pe
calamity 2013/09/10 22:50:46 It prevents the app list from populating with 0 ap
FOR_EACH_OBSERVER(PaginationModelObserver, observers_, TotalPagesChanged());
}
@@ -82,7 +82,7 @@ void PaginationModel::SelectPage(int page, bool animate) {
}
}
} else {
- DCHECK(page >= 0 && page < total_pages_);
+ DCHECK(total_pages_ == 0 || (page >= 0 && page < total_pages_));
if (page == selected_page_)
return;

Powered by Google App Engine
This is Rietveld 408576698