summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authorJackie Quinn <jyquinn@chromium.org>2016-01-25 07:20:59 -0800
committerJackie Quinn <jyquinn@chromium.org>2016-01-25 15:23:12 +0000
commit525d05542f26da9549ff6513ea0384523d7532d1 (patch)
treecfabcf75004049524ff9735d936685f2250a5c14 /ios
parente16eb750c3ea1f5e4588de4215a3bbefce34b92a (diff)
downloadchromium_src-525d05542f26da9549ff6513ea0384523d7532d1.zip
chromium_src-525d05542f26da9549ff6513ea0384523d7532d1.tar.gz
chromium_src-525d05542f26da9549ff6513ea0384523d7532d1.tar.bz2
Call stopLoading when opening native application
Previously, abortLoad was called, which did not fully handle session management or returning to native pages such as the new tab page. BUG=579766 Review URL: https://codereview.chromium.org/1612743002 Cr-Commit-Position: refs/heads/master@{#370613} (cherry picked from commit 94eade2c798535c64cd286820064348aa255c5a8) Review URL: https://codereview.chromium.org/1630693002 . Cr-Commit-Position: refs/branch-heads/2623@{#115} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'ios')
-rw-r--r--ios/web/web_state/ui/crw_web_controller.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 7f298c8..01d6a55 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -2791,7 +2791,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
// that errors reported following the 'NO' reply can be safely ignored.
if ([self shouldClosePageOnNativeApplicationLoad])
[_delegate webPageOrderedClose];
- [self abortLoad];
+ [self stopLoading];
[_openedApplicationURL addObject:request.URL];
return NO;
}