Revert of 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 01dccd9dccd4102a202596e605c9b2880d87e56f..452e4fdfc2d17aba57f8218b3e880806ecc1afb7 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -46,8 +46,6 @@
 
 ContentsView::~ContentsView() {
   pagination_model_.RemoveObserver(this);
-  if (contents_switcher_view_)
-    pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
 void ContentsView::InitNamedPages(AppListModel* model,
@@ -97,14 +95,6 @@
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
-}
-
-void ContentsView::SetContentsSwitcherView(
-    ContentsSwitcherView* contents_switcher_view) {
-  DCHECK(!contents_switcher_view_);
-  contents_switcher_view_ = contents_switcher_view;
-  if (contents_switcher_view_)
-    pagination_model_.AddObserver(contents_switcher_view_);
 }
 
 void ContentsView::SetActivePage(int page_index) {
@@ -254,9 +244,9 @@
   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;
 }