diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 01:03:48 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 01:03:48 +0000 |
| commit | d080d3e45d72575612058097b338c9aad8ef481c (patch) | |
| tree | 8117352833e5595dc476db8d9bf6f7414c40db9c /ash/shelf | |
| parent | e9b84dd40be75e6855e96112718085e05ce53b0b (diff) | |
| download | chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.zip chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.tar.gz chromium_src-d080d3e45d72575612058097b338c9aad8ef481c.tar.bz2 | |
Removes --ash-disable-drag-off-shelf flag
BUG=284772
Review URL: https://codereview.chromium.org/191413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 6737692..239f155 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -1035,7 +1035,7 @@ void ShelfView::ContinueDrag(const ui::LocatedEvent& event) { // If this is not a drag and drop host operation and not the app list item, // check if the item got ripped off the shelf - if it did we are done. - if (!drag_and_drop_shelf_id_ && ash::switches::UseDragOffShelf() && + if (!drag_and_drop_shelf_id_ && RemovableByRipOff(current_index) != NOT_REMOVABLE) { if (HandleRipOffDrag(event)) return; |