Experimental app list: Added a current page indicator to the launcher.

ui/app_list/views/contents_view.cc

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 452e4fdfc2d17aba57f8218b3e880806ecc1afb7..42cc455545eb93d76948723a061dc727ec6b96b5 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -46,6 +46,8 @@ ContentsView::ContentsView(AppListMainView* app_list_main_view)
 
 ContentsView::~ContentsView() {
   pagination_model_.RemoveObserver(this);
+  if (contents_switcher_view_)
+    pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
 void ContentsView::InitNamedPages(AppListModel* model,
@@ -75,6 +77,7 @@ void ContentsView::InitNamedPages(AppListModel* model,
   if (app_list::switches::IsExperimentalAppListEnabled())
     initial_page_index = GetPageIndexForNamedPage(NAMED_PAGE_START);
 
+  pagination_model_.SetTransitionDurations(1500, 1500);
   pagination_model_.SelectPage(initial_page_index, false);
 
   // Needed to update the main search box visibility.
@@ -97,6 +100,13 @@ void ContentsView::SetDragAndDropHostOfCurrentAppList(
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
+void ContentsView::set_contents_switcher_view(
+    ContentsSwitcherView* contents_switcher_view) {
+  contents_switcher_view_ = contents_switcher_view;

[calamity, 2014/07/10 03:59:36]

Better DCHECK(!contents_switcher_view_) here now since changing the
ContentsSwitcherView will require a RemoveObserver.

+  if (contents_switcher_view_)
+    pagination_model_.AddObserver(contents_switcher_view_);
+}
+
 void ContentsView::SetActivePage(int page_index) {
   if (GetActivePageIndex() == page_index)
     return;
@@ -244,9 +254,9 @@ int ContentsView::AddLauncherPage(views::View* view, int resource_id) {
   int page_index = view_model_->view_size();
   AddChildView(view);
   view_model_->Add(view, page_index);
-  pagination_model_.SetTotalPages(view_model_->view_size());
   if (contents_switcher_view_)
     contents_switcher_view_->AddSwitcherButton(resource_id, page_index);
+  pagination_model_.SetTotalPages(view_model_->view_size());
   return page_index;
 }