[Multi-instance] Fix merging after process killed in background
An M69 change broke an edge case for multi-instance tab model merging (see http://crrev.com/c/1153438). This CL updates TabWindowManager to merge tabs into ChromeTabbedActivity2 when creating a new TabPersistencePolicy iff there are no other currently assigned tab model selectors and the activity is not in multi-window mode. Also adds a test to help prevent future regressions. BUG=982305 Change-Id: Ib43b1de13aea654d0f2a2e5c14021ee09713ab66 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1693129Reviewed-by:Matthew Jones <mdjones@chromium.org> Reviewed-by:
Theresa <twellington@chromium.org> Commit-Queue: Theresa <twellington@chromium.org> Cr-Commit-Position: refs/heads/master@{#676078}
Showing
Please register or sign in to comment