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 58 matching lines @@
   }
 
   apps_container_view_ = new AppsContainerView(app_list_main_view_, model);
 
   int initial_page_index = AddLauncherPage(
       apps_container_view_, IDR_APP_LIST_APPS_ICON, NAMED_PAGE_APPS);
   if (app_list::switches::IsExperimentalAppListEnabled())
     initial_page_index = GetPageIndexForNamedPage(NAMED_PAGE_START);
 
   pagination_model_.SelectPage(initial_page_index, false);
+  if (contents_switcher_view_)
+    contents_switcher_view_->SelectedPageChanged(-1, initial_page_index);
 
   // Needed to update the main search box visibility.
   ActivePageChanged(false);
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
     apps_container_view_->apps_grid_view()->EndDrag(true);
   if (apps_container_view_->app_list_folder_view()
           ->items_grid_view()
@@ skipping 150 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);

[calamity, 2014/07/09 08:02:54]

Lines 79-80 can be removed if you move this above SetTotalPages(). This was
happening because SetTotalPages() triggered the notification but
AddSwitcherButton() hadn't added the indicator yet, causing the
ContentsSwitcherView::SelectedPageChanged() to have no effect.

[kcarattini, 2014/07/10 03:33:27]

Done.

   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 51 matching lines @@
     return true;
   }
 
   return false;
 }
 
 void ContentsView::TotalPagesChanged() {
 }
 
 void ContentsView::SelectedPageChanged(int old_selected, int new_selected) {
+  if (contents_switcher_view_)
+    contents_switcher_view_->SelectedPageChanged(old_selected, new_selected);
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 void ContentsView::OnGestureEvent(ui::GestureEvent* event) {
@@ skipping 47 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