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

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/contents_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 28 matching lines @@
     : search_results_view_(NULL),
       start_page_view_(NULL),
       app_list_main_view_(app_list_main_view),
       contents_switcher_view_(NULL),
       view_model_(new views::ViewModel) {
   pagination_model_.AddObserver(this);
 }
 
 ContentsView::~ContentsView() {
   pagination_model_.RemoveObserver(this);
-  if (contents_switcher_view_)
-    pagination_model_.RemoveObserver(contents_switcher_view_);
 }
 
 void ContentsView::InitNamedPages(AppListModel* model,
                                   AppListViewDelegate* view_delegate) {
   DCHECK(model);
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     views::View* custom_page_view =
         view_delegate->CreateCustomPageWebView(GetLocalBounds().size());
     if (custom_page_view)
@@ skipping 31 matching lines @@
     apps_container_view_->app_list_folder_view()->items_grid_view()->EndDrag(
         true);
   }
 }
 
 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) {
   if (GetActivePageIndex() == page_index)
     return;
 
   SetActivePageInternal(page_index, false);
 }
 
 int ContentsView::GetActivePageIndex() const {
   // The active page is changed at the beginning of an animation, not the end.
   return pagination_model_.SelectedTargetPage();
@@ skipping 127 matching lines @@
 }
 
 void ContentsView::AddBlankPageForTesting() {
   AddLauncherPage(new views::View, 0);
 }
 
 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;
 }
 
 int ContentsView::AddLauncherPage(views::View* view,
                                   int resource_id,
                                   NamedPage named_page) {
   int page_index = AddLauncherPage(view, resource_id);
   named_page_to_view_.insert(std::pair<NamedPage, int>(named_page, page_index));
   return page_index;
 }
@@ skipping 118 matching lines @@
   if (std::abs(offset) > kMinScrollToSwitchPage) {
     if (!GetAppsPaginationModel()->has_transition()) {
       GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list