https://chromium-review.googlesource.com/c/chromium/src/+/1102150

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

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

commit 291b90a2ffdaeba3aa919bd6f7fd0150ca4dd447
Author: Ryan Landay <rlanday@chromium.org>
Date: Fri Jun 15 04:02:11 2018

Fix incognito toggle immediately after tab closure in Android tab switcher

In the Android horizontal tab switcher, if you quickly discard a normal tab and
then tap the incognito toggle while not having any incognito tabs open, we
currently have a bug causing us to stay in normal mode instead of switching to
incognito mode. This is because the tab closure happens after the model has
already switched, and closing a tab resets the current model to that of the tab
that was just closed, so it brings us back to normal mode.

The fix is to call StackLayout#commitOutstandingModelState() in the incognito
toggle button tab handler before changing the active model (which triggers the
animation). We already do this the handler for the button that shows/hides the
tab switcher.

Bug:  853071 ,831359
Change-Id: Ia7a199f8c357f5258625aec38bde1e6fbbe9a6da
Reviewed-on: https://chromium-review.googlesource.com/1102150
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567542}
[modify] https://crrev.com/291b90a2ffdaeba3aa919bd6f7fd0150ca4dd447/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

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

commit 89dd6773f0046a22541188f7a9042f16540536d0
Author: Ryan Landay <rlanday@chromium.org>
Date: Mon Jun 18 23:10:40 2018

Fix incognito toggle immediately after tab closure in Android tab switcher

In the Android horizontal tab switcher, if you quickly discard a normal tab and
then tap the incognito toggle while not having any incognito tabs open, we
currently have a bug causing us to stay in normal mode instead of switching to
incognito mode. This is because the tab closure happens after the model has
already switched, and closing a tab resets the current model to that of the tab
that was just closed, so it brings us back to normal mode.

The fix is to call StackLayout#commitOutstandingModelState() in the incognito
toggle button tab handler before changing the active model (which triggers the
animation). We already do this the handler for the button that shows/hides the
tab switcher.

Bug:  853071 ,831359
Change-Id: Ia7a199f8c357f5258625aec38bde1e6fbbe9a6da
Reviewed-on: https://chromium-review.googlesource.com/1102150
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#567542}(cherry picked from commit 291b90a2ffdaeba3aa919bd6f7fd0150ca4dd447)
Reviewed-on: https://chromium-review.googlesource.com/1105437
Reviewed-by: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/branch-heads/3440@{#432}
Cr-Branched-From: 010ddcfda246975d194964ccf20038ebbdec6084-refs/heads/master@{#561733}
[modify] https://crrev.com/89dd6773f0046a22541188f7a9042f16540536d0/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java