Split app list drop target into reorder and folder drop targets.

ui/app_list/views/apps_grid_view.h

Index: ui/app_list/views/apps_grid_view.h
diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
index f509284b54e61b51c504acf79ee89fda1b968f8c..9cf935fd618ebea2bb794dab6fd806f61e711b43 100644
--- a/ui/app_list/views/apps_grid_view.h
+++ b/ui/app_list/views/apps_grid_view.h
@@ -390,9 +390,9 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
   // dropped into it.
   bool CanDropIntoTarget(const Index& drop_target);
 
-  // Returns the visual index of the nearest tile in which |drag_view_| enters
-  // either its re-ordering or folder dropping circle.
-  Index GetNearestTileForDragView();
+  // Calculates the visual index of the nearest tile for which |drag_view_|
+  // enters either its re-ordering or folder dropping circle.
+  void CalculateNearestTileForDragView();
 
   // Calculates |nearest_tile| in which |vertex| of the |drag_view| is
   // enclosed.
@@ -513,7 +513,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
 #endif
 
   Pointer drag_pointer_;
-  Index drop_target_;
+  Index reorder_drop_target_;

[Matt Giuca, 2014/09/11 03:35:39]

Comments here.

In particular, say that reorder_drop_target_ is only valid when drop_attempt_ is
DROP_FOR_REORDER, and so on.

[calamity, 2014/09/11 07:05:17]

Done.

+  Index folder_drop_target_;
   DropAttempt drop_attempt_;
 
   // Timer for re-ordering the |drop_target_| and |drag_view_|.