Commit ec4668d3 authored by Nohemi Fernandez's avatar Nohemi Fernandez Committed by Commit Bot

[iOS][multiball] Fix crash following sign-in interrupt.

We attempt to open a URL in a new tab through two different entry points
in the multiwindow use case:
- 1 when we populate self.sceneState.URLContextsToOpen per scene
- 2 when we populate self.mainController.startupParameters

This patch ensures that we only call one of these.

Bug: 1096489
Change-Id: I7c5c0fffc1d0f194d041f6ef3c734cb4da7ca385
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254599
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780776}
parent 4e786c18
......@@ -339,32 +339,13 @@ const char kMultiWindowOpenInNewWindowHistogram[] =
// Handle URL opening from
// |UIWindowSceneDelegate scene:openURLContexts:|.
if (self.sceneState.URLContextsToOpen) {
// When multiwindow is supported we already pass the external URLs
// through the scene state, therefore we do not need to rely on
// startup parameters.
[self openURLContexts:self.sceneState.URLContextsToOpen];
self.sceneState.URLContextsToOpen = nil;
}
}
if (self.mainController.startupParameters) {
ApplicationModeForTabOpening mode =
self.mainController.startupParameters.launchInIncognito
? ApplicationModeForTabOpening::INCOGNITO
: ApplicationModeForTabOpening::NORMAL;
[self
dismissModalsAndOpenSelectedTabInMode:mode
withUrlLoadParams:UrlLoadParams::InNewTab(
self.mainController
.startupParameters
.externalURL)
dismissOmnibox:
[self.mainController.startupParameters
postOpeningAction] !=
FOCUS_OMNIBOX
completion:^{
self.mainController.startupParameters =
nil;
}];
}
} else {
NSDictionary* launchOptions = self.mainController.launchOptions;
URLOpenerParams* params =
......
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