AppsGridView: Use specific types instead of views::View*.

ui/app_list/views/apps_grid_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_APPS_GRID_VIEW_H_
 #define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_
 
 #include <set>
 #include <string>
 
@@ skipping 33 matching lines @@
 namespace test {
 class AppsGridViewTestApi;
 }
 
 class ApplicationDragAndDropHost;
 class AppListItemView;
 class AppsGridViewDelegate;
 class AppsGridViewFolderDelegate;
 class PageSwitcher;
 class PaginationController;
+class PulsingBlockView;
 
 // AppsGridView displays a grid for AppListItemList sub model.
 class APP_LIST_EXPORT AppsGridView : public views::View,
                                      public views::ButtonListener,
                                      public AppListItemListObserver,
                                      public PaginationModelObserver,
                                      public AppListModelObserver,
                                      public ui::ImplicitAnimationObserver {
  public:
   enum Pointer {
@@ skipping 17 matching lines @@
   // This resets the grid view to a fresh state for showing the app list.
   void ResetForShowApps();
 
   // Sets |model| to use. Note this does not take ownership of |model|.
   void SetModel(AppListModel* model);
 
   // Sets the |item_list| to render. Note this does not take ownership of
   // |item_list|.
   void SetItemList(AppListItemList* item_list);
 
-  void SetSelectedView(views::View* view);
-  void ClearSelectedView(views::View* view);
+  void SetSelectedView(AppListItemView* view);
+  void ClearSelectedView(AppListItemView* view);
   void ClearAnySelectedView();
-  bool IsSelectedView(const views::View* view) const;
+  bool IsSelectedView(const AppListItemView* view) const;
 
   // Ensures the view is visible. Note that if there is a running page
   // transition, this does nothing.
-  void EnsureViewVisible(const views::View* view);
+  void EnsureViewVisible(const AppListItemView* view);
 
   void InitiateDrag(AppListItemView* view,
                     Pointer pointer,
                     const ui::LocatedEvent& event);
 
   // Called from AppListItemView when it receives a drag event. Returns true
   // if the drag is still happening.
   bool UpdateDragFromItem(Pointer pointer, const ui::LocatedEvent& event);
 
   // Called when the user is dragging an app. |point| is in grid view
   // coordinates.
   void UpdateDrag(Pointer pointer, const gfx::Point& point);
   void EndDrag(bool cancel);
-  bool IsDraggedView(const views::View* view) const;
+  bool IsDraggedView(const AppListItemView* view) const;
   void ClearDragState();
   void SetDragViewVisible(bool visible);
 
   // Set the drag and drop host for application links.
   void SetDragAndDropHostOfCurrentAppList(
       ApplicationDragAndDropHost* drag_and_drop_host);
 
   // Prerenders the icons on and around the currently selected page.
   void Prerender();
 
   // Return true if the |bounds_animator_| is animating |view|.
-  bool IsAnimatingView(views::View* view);
+  bool IsAnimatingView(AppListItemView* view);
 
   bool has_dragged_view() const { return drag_view_ != NULL; }
   bool dragging() const { return drag_pointer_ != NONE; }
 
   // Gets the PaginationModel used for the grid view.
   PaginationModel* pagination_model() { return &pagination_model_; }
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
@@ skipping 116 matching lines @@
   // Updates from model.
   void Update();
 
   // Updates page splits for item views.
   void UpdatePaging();
 
   // Updates the number of pulsing block views based on AppListModel status and
   // number of apps.
   void UpdatePulsingBlockViews();
 
-  views::View* CreateViewForItemAtIndex(size_t index);
+  // Returns the pulsing block view of the item at |index| in the pulsing block
+  // model.
+  PulsingBlockView* GetPulsingBlockViewAt(int index) const;
+
+  AppListItemView* CreateViewForItemAtIndex(size_t index);
 
   // Convert between the model index and the visual index. The model index
   // is the index of the item in AppListModel. The visual index is the Index
   // struct above with page/slot info of where to display the item.
   Index GetIndexFromModelIndex(int model_index) const;
   int GetModelIndexFromIndex(const Index& index) const;
 
   void SetSelectedItemByIndex(const Index& index);
   bool IsValidIndex(const Index& index) const;
 
-  Index GetIndexOfView(const views::View* view) const;
-  views::View* GetViewAtIndex(const Index& index) const;
+  Index GetIndexOfView(const AppListItemView* view) const;
+  AppListItemView* GetViewAtIndex(const Index& index) const;
 
   // Gets the index of the AppListItemView at the end of the view model.
   Index GetLastViewIndex() const;
 
   void MoveSelected(int page_delta, int slot_x_delta, int slot_y_delta);
 
   void CalculateIdealBounds();
   void AnimateToIdealBounds();
 
   // Invoked when the given |view|'s current bounds and target bounds are on
   // different rows. To avoid moving diagonally, |view| would be put into a
   // slot prior |target| and fade in while moving to |target|. In the meanwhile,
   // a layer copy of |view| would start at |current| and fade out while moving
   // to succeeding slot of |current|. |animate_current| controls whether to run
   // fading out animation from |current|. |animate_target| controls whether to
   // run fading in animation to |target|.
-  void AnimationBetweenRows(views::View* view,
+  void AnimationBetweenRows(AppListItemView* view,
                             bool animate_current,
                             const gfx::Rect& current,
                             bool animate_target,
                             const gfx::Rect& target);
 
   // Extracts drag location info from |event| into |drag_point|.
   void ExtractDragLocation(const ui::LocatedEvent& event,
                            gfx::Point* drag_point);
 
   // Updates |reorder_drop_target_|, |folder_drop_target_| and |drop_attempt_|
@@ skipping 19 matching lines @@
       const gfx::Point& location_in_screen_coordinates);
 
   // Starts the page flip timer if |drag_point| is in left/right side page flip
   // zone or is over page switcher.
   void MaybeStartPageFlipTimer(const gfx::Point& drag_point);
 
   // Invoked when |page_flip_timer_| fires.
   void OnPageFlipTimer();
 
   // Updates |model_| to move item represented by |item_view| to |target| slot.
-  void MoveItemInModel(views::View* item_view, const Index& target);
+  void MoveItemInModel(AppListItemView* item_view, const Index& target);
 
   // Updates |model_| to move item represented by |item_view| into a folder
   // containing item located at |target| slot, also update |view_model_| for
   // the related view changes.
-  void MoveItemToFolder(views::View* item_view, const Index& target);
+  void MoveItemToFolder(AppListItemView* item_view, const Index& target);
 
   // Updates both data model and view_model_ for re-parenting a folder item to a
   // new position in top level item list.
-  void ReparentItemForReorder(views::View* item_view, const Index& target);
+  void ReparentItemForReorder(AppListItemView* item_view, const Index& target);
 
   // Updates both data model and view_model_ for re-parenting a folder item
   // to anther folder target.
-  void ReparentItemToAnotherFolder(views::View* item_view, const Index& target);
+  void ReparentItemToAnotherFolder(AppListItemView* item_view,
+                                   const Index& target);
 
   // If there is only 1 item left in the source folder after reparenting an item
   // from it, updates both data model and view_model_ for removing last item
   // from the source folder and removes the source folder.
   void RemoveLastItemFromReparentItemFolderIfNecessary(
       const std::string& source_folder_id);
 
   // If user does not drop the re-parenting folder item to any valid target,
   // cancel the re-parenting action, let the item go back to its original
   // parent folder with UI animation.
@@ skipping 29 matching lines @@
   // Overridden from AppListModelObserver:
   virtual void OnAppListModelStatusChanged() OVERRIDE;
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
   // Hide a given view temporarily without losing (mouse) events and / or
   // changing the size of it. If |immediate| is set the change will be
   // immediately applied - otherwise it will change gradually.
   // If |hide| is set the view will get hidden, otherwise it gets shown.
-  void SetViewHidden(views::View* view, bool hide, bool immediate);
+  void SetViewHidden(AppListItemView* view, bool hide, bool immediate);
 
   // Whether the folder drag-and-drop UI should be enabled.
   bool EnableFolderDragDropUI();
 
   // Whether target specified by |drap_target| can accept more items to be
   // dropped into it.
   bool CanDropIntoTarget(const Index& drop_target) const;
 
   // Returns the size of the entire tile grid.
   gfx::Size GetTileGridSize() const;
 
   // Returns the slot number which the given |point| falls into or the closest
   // slot if |point| is outside the page's bounds.
   Index GetNearestTileIndexForPoint(const gfx::Point& point) const;
 
   // Gets the bounds of the tile located at |slot| on the current page.
   gfx::Rect GetExpectedTileBounds(int slot) const;
 
   // Gets the bounds of the tile located at |row| and |col| on the current page.
   gfx::Rect GetExpectedTileBounds(int row, int col) const;
 
-  // Gets the item view located at |slot| on the current page. If there is
-  // no item located at |slot|, returns NULL.
-  views::View* GetViewAtSlotOnCurrentPage(int slot);
+  // Gets the item view currently displayed at |slot| on the current page. If
+  // there is no item displayed at |slot|, returns NULL. Note that this finds an
+  // item *displayed* at a slot, which may differ from the item's location in
+  // the model (as it may have been temporarily moved during a drag operation).

[calamity, 2014/09/30 01:22:23]

Noice.

[Matt Giuca, 2014/09/30 01:32:06]

Acknowledged.

+  AppListItemView* GetViewDisplayedAtSlotOnCurrentPage(int slot);
 
   // Sets state of the view with |target_index| to |is_target_folder| for
   // dropping |drag_view_|.
   void SetAsFolderDroppingTarget(const Index& target_index,
                                  bool is_target_folder);
 
   // Invoked when |reorder_timer_| fires to show re-order preview UI.
   void OnReorderTimer();
 
   // Invoked when |folder_item_reparent_timer_| fires.
@@ skipping 39 matching lines @@
   AppsGridViewFolderDelegate* folder_delegate_;
 
   PaginationModel pagination_model_;
   // Must appear after |pagination_model_|.
   scoped_ptr<PaginationController> pagination_controller_;
   PageSwitcher* page_switcher_view_;  // Owned by views hierarchy.
 
   int cols_;
   int rows_per_page_;
 
-  // Tracks app item views. There is a view per item in |model_|.
+  // List of AppListItemViews. There is a view per item in |model_|.
   views::ViewModel view_model_;
 
-  // Tracks pulsing block views.
+  // List of PulsingBlockViews.
   views::ViewModel pulsing_blocks_model_;
 
-  views::View* selected_view_;
+  AppListItemView* selected_view_;
 
   AppListItemView* drag_view_;
 
   // The index of the drag_view_ when the drag starts.
   Index drag_view_init_index_;
 
   // The point where the drag started in AppListItemView coordinates.
   gfx::Point drag_view_offset_;
 
   // The point where the drag started in GridView coordinates.
@@ skipping 70 matching lines @@
 
   // True if the drag_view_ item is a folder item being dragged for reparenting.
   bool dragging_for_reparent_item_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_H_