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

ui/app_list/views/contents_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 47 matching lines @@
   void InitNamedPages(AppListModel* model, AppListViewDelegate* view_delegate);
 
   // The app list gets closed and drag and drop operations need to be cancelled.
   void CancelDrag();
 
   // If |drag_and_drop| is not NULL it will be called upon drag and drop
   // operations outside the application list.
   void SetDragAndDropHostOfCurrentAppList(
       ApplicationDragAndDropHost* drag_and_drop_host);
 
-  void set_contents_switcher_view(
-      ContentsSwitcherView* contents_switcher_view) {
-    contents_switcher_view_ = contents_switcher_view;
-  }
+  void set_contents_switcher_view(ContentsSwitcherView* contents_switcher_view);

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

This should change to SetContentsSwitcherView now. unix_case and inlined in
header for simple x_ = x; style setters and getters, CamelCase for anything at
all more complex.

[kcarattini, 2014/07/10 06:07:46]

Done.

 
   void ShowSearchResults(bool show);
   void ShowFolderContent(AppListFolderItem* folder);
   bool IsShowingSearchResults() const;
 
   // Sets the active launcher page and animates the pages into place.
   void SetActivePage(int page_index);
 
   // The index of the currently active launcher page.
   int GetActivePageIndex() const;
@@ skipping 21 matching lines @@
   virtual void Layout() OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
 
   // Overridden from PaginationModelObserver:
   virtual void TotalPagesChanged() OVERRIDE;
   virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE;
   virtual void TransitionStarted() OVERRIDE;
   virtual void TransitionChanged() OVERRIDE;
 
+  // Returns the pagination model for thei ContentsView.

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

s/thei/the/

[kcarattini, 2014/07/10 06:07:46]

Done.

+  const PaginationModel& pagination_model() { return pagination_model_; }
+
  private:
   // Sets the active launcher page, accounting for whether the change is for
   // search results.
   void SetActivePageInternal(int page_index, bool show_search_results);
 
   // Invoked when active view is changed.
   void ActivePageChanged(bool show_search_results);
 
   // Calculates and sets the bounds for the subviews. If there is currently an
   // animation, this positions the views as appropriate for the current frame.
@@ skipping 35 matching lines @@
 
   // Manages the pagination for the launcher pages.
   PaginationModel pagination_model_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_