Commit a0e11743 authored by Patrick Noland's avatar Patrick Noland Committed by Commit Bot

Always call set on mIntentWithEffectSupplier

Bug: 1111296
Change-Id: I7f0609ee89c00362885cf9ab8df1b41d26ee453e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339703Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795475}
parent 734d53c5
......@@ -1111,7 +1111,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
if (getSavedInstanceState() == null && intent != null) {
if (!mIntentHandler.shouldIgnoreIntent(intent)) {
mIntentWithEffect = mIntentHandler.onNewIntent(intent);
mIntentWithEffectSupplier.set(mIntentWithEffect);
}
if (isMainIntentFromLauncher(intent)) {
......@@ -1119,6 +1118,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
}
}
mIntentWithEffectSupplier.set(mIntentWithEffect);
// If we have tabs to reparent and getSavedInstanceState() is non-null, then the tabs
// are coming from night mode tab reparenting. In this case, reparenting happens
// synchronously along with tab restoration so there are no tabs waiting for
......
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