https://chromium-review.googlesource.com/1096489

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4b8dcd4d23994a57d4c3bc40e06739eb6d03b076

commit 4b8dcd4d23994a57d4c3bc40e06739eb6d03b076
Author: Ryan Landay <rlanday@chromium.org>
Date: Tue Jun 12 16:49:33 2018

Fix tabs getting stuck in partially-discarded state in Android tab switcher

In the Android horizontal tab switcher, we currently have a bug where if you
start dragging a tab up to discard it, and then hit the incognito toggle, and
then hit the toggle again so the tabs come back, the tab will be stuck in a
partially-discarded state.

This CL fixes this bug by borrowing some logic from onUpOrCancel() to undiscard
all the tabs before running the switch away animation.

Bug:  851763 ,831359
Change-Id: If6a8cb62b997cc0e77b8dd8ec649f3b27b113e61
Reviewed-on: https://chromium-review.googlesource.com/1096489
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566465}
[modify] https://crrev.com/4b8dcd4d23994a57d4c3bc40e06739eb6d03b076/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/NonOverlappingStack.java
[modify] https://crrev.com/4b8dcd4d23994a57d4c3bc40e06739eb6d03b076/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java

This bug requires manual review: M68 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: cmasso@(Android), kariahda@(iOS), bhthompson@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Please verify the fix in canary

Verified in 69.0.3457.0

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7eb134271f1b544a7dac455c11885e1be11a0896

commit 7eb134271f1b544a7dac455c11885e1be11a0896
Author: Ryan Landay <rlanday@chromium.org>
Date: Thu Jun 14 21:06:00 2018

Fix tabs getting stuck in partially-discarded state in Android tab switcher

In the Android horizontal tab switcher, we currently have a bug where if you
start dragging a tab up to discard it, and then hit the incognito toggle, and
then hit the toggle again so the tabs come back, the tab will be stuck in a
partially-discarded state.

This CL fixes this bug by borrowing some logic from onUpOrCancel() to undiscard
all the tabs before running the switch away animation.

Bug:  851763 ,831359
Change-Id: If6a8cb62b997cc0e77b8dd8ec649f3b27b113e61
Reviewed-on: https://chromium-review.googlesource.com/1096489
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#566465}(cherry picked from commit 4b8dcd4d23994a57d4c3bc40e06739eb6d03b076)
Reviewed-on: https://chromium-review.googlesource.com/1101758
Reviewed-by: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/branch-heads/3440@{#365}
Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733}
[modify] https://crrev.com/7eb134271f1b544a7dac455c11885e1be11a0896/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/NonOverlappingStack.java
[modify] https://crrev.com/7eb134271f1b544a7dac455c11885e1be11a0896/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java