shelf: Allow dragging items from main shelf to overflow shelf.

ash/shelf/shelf_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 ASH_SHELF_SHELF_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 428 matching lines @@
 
   // The cursor offset to the middle of the dragged item.
   gfx::Vector2d drag_image_offset_;
 
   // The view which gets replaced by our drag icon proxy.
   views::View* drag_replaced_view_;
 
   // True when the icon was dragged off the shelf.
   bool dragged_off_shelf_;
 
+  // True when an item is dragged from one shelf to another (eg. overflow).
+  bool dragged_to_another_shelf_;
+
   // The rip off view when a snap back operation is underway.
   views::View* snap_back_from_rip_off_view_;
 
   // True when this ShelfView is used for Overflow Bubble.
   bool overflow_mode_;
 
   // Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
   ShelfView* main_shelf_;
 
-  // True when ripped item from overflow bubble is entered into Shelf.
-  bool dragged_off_from_overflow_to_shelf_;
-
   // True if the event is a repost event from a event which has just closed the
   // menu of the same shelf item.
   bool is_repost_event_on_same_item_;
 
   // Record the index for the last pressed shelf item. This variable is used to
   // check if a repost event occurs on the same shelf item as previous one. If
   // so, the repost event should be ignored.
   int last_pressed_index_;
 
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
   base::WeakPtrFactory<ShelfView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_