Commit ac2e56bc authored by Pedro Amaral's avatar Pedro Amaral Committed by Commit Bot

Swapping new tab and incognito toggle buttons in Bottom Toolbar


The fixes a hole that is present in the bottom toolbar when the
horizontal tab switcher is not enabled. It also makes it easier to
reach the new tab button which we expect to be more used than the
toggle button.

Change-Id: I7fa5bc192516d956a78704c4d90e2d656abd856c
Reviewed-on: https://chromium-review.googlesource.com/1170193Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582979}
parent b58ccf6d
......@@ -829,7 +829,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
&& ChromeFeatureList.isEnabled(
ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID)
&& PrefServiceBridge.getInstance().isIncognitoModeEnabled();
final ToolbarButtonData secondSlotTabSwitcherButtonData = showIncognitoToggleButton
final ToolbarButtonData firstSlotTabSwitcherButtonData = showIncognitoToggleButton
? createIncognitoToggleButton(
wrapBottomToolbarClickListenerForIPH(incognitoClickHandler),
mActivity)
......@@ -841,9 +841,9 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
wrapBottomToolbarClickListenerForIPH(tabSwitcherClickHandler),
mAppMenuButtonHelper, mTabModelSelector, mOverviewModeBehavior,
mActivity.getContextualSearchManager(), mActivity.getWindowAndroid(),
firstSlotTabSwitcherButtonData,
createNewTabButton(
wrapBottomToolbarClickListenerForIPH(newTabClickHandler), mActivity),
secondSlotTabSwitcherButtonData);
wrapBottomToolbarClickListenerForIPH(newTabClickHandler), mActivity));
Tab currentTab = tabModelSelector.getCurrentTab();
maybeShowDuetHelpBubble(currentTab);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment