GitLab

Fix the tabswitcher overlay when both the EoC and incognito toolbar
buttons are shown. Previously, when the incognito toggle button was
shown in the toolbar button container the EoC button was incorrectly
offset in the tabswitcher animation overlay.

The two buttons are now contained in a single FrameLayout and the
tabswitcher animation overlay draw logic is adjusted to properly
translate to the experimental button.

BUG=863819

Change-Id: I4a60f6f15b516f2a7933c3cde4e7a4a23831b0f7
Reviewed-on: https://chromium-review.googlesource.com/1148585Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577599}