Commit 40d837ca authored by Pedro Amaral's avatar Pedro Amaral Committed by Commit Bot

Set bottom bar incognito state on initialize native

Previously we assumed that Chrome would always start-up
on regular browsing mode (never in incognito). The linked
bugs prove that this is not true - sometimes the app starts
in incognito. This CL sets the incognito state on initialize
with native.

Bug: 881837, 880178
Change-Id: I67cf33b4be10997c5f62a85d893febde0c278b87
Reviewed-on: https://chromium-review.googlesource.com/1213313
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: default avatarPedro Amaral <amaralp@chromium.org>
Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589664}
parent 7853c572
...@@ -117,12 +117,13 @@ public class BottomToolbarCoordinator { ...@@ -117,12 +117,13 @@ public class BottomToolbarCoordinator {
OnClickListener tabSwitcherListener, AppMenuButtonHelper menuButtonHelper, OnClickListener tabSwitcherListener, AppMenuButtonHelper menuButtonHelper,
TabModelSelector tabModelSelector, OverviewModeBehavior overviewModeBehavior, TabModelSelector tabModelSelector, OverviewModeBehavior overviewModeBehavior,
WindowAndroid windowAndroid, ToolbarButtonData firstSlotTabSwitcherButtonData, WindowAndroid windowAndroid, ToolbarButtonData firstSlotTabSwitcherButtonData,
ToolbarButtonData secondSlotTabSwitcherButtonData) { ToolbarButtonData secondSlotTabSwitcherButtonData, boolean isIncognito) {
mMediator.setLayoutManager(layoutManager); mMediator.setLayoutManager(layoutManager);
mMediator.setResourceManager(resourceManager); mMediator.setResourceManager(resourceManager);
mMediator.setOverviewModeBehavior(overviewModeBehavior); mMediator.setOverviewModeBehavior(overviewModeBehavior);
mMediator.setToolbarSwipeHandler(layoutManager.getToolbarSwipeHandler()); mMediator.setToolbarSwipeHandler(layoutManager.getToolbarSwipeHandler());
mMediator.setWindowAndroid(windowAndroid); mMediator.setWindowAndroid(windowAndroid);
setIncognito(isIncognito);
mMediator.setTabSwitcherButtonData( mMediator.setTabSwitcherButtonData(
firstSlotTabSwitcherButtonData, secondSlotTabSwitcherButtonData); firstSlotTabSwitcherButtonData, secondSlotTabSwitcherButtonData);
......
...@@ -886,7 +886,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe ...@@ -886,7 +886,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
mAppMenuButtonHelper, mTabModelSelector, mOverviewModeBehavior, mAppMenuButtonHelper, mTabModelSelector, mOverviewModeBehavior,
mActivity.getWindowAndroid(), firstSlotTabSwitcherButtonData, mActivity.getWindowAndroid(), firstSlotTabSwitcherButtonData,
createNewTabButton( createNewTabButton(
wrapBottomToolbarClickListenerForIPH(newTabClickHandler))); wrapBottomToolbarClickListenerForIPH(newTabClickHandler)),
tabModelSelector.getCurrentModel().isIncognito());
Tab currentTab = tabModelSelector.getCurrentTab(); Tab currentTab = tabModelSelector.getCurrentTab();
maybeShowDuetHelpBubble(currentTab); 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