Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 1921093002: Remove abortWebLoad from CRWWebController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 6bd0fe6a18781ea403602d29e5535120db67119e..2cf1d69a104f1675517295996e417d00268fc271 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -641,8 +641,6 @@ NSError* WKWebViewErrorWithSource(NSError* error, WKWebViewErrorSource source) {
- (void)reloadInternal;
// Aborts any load for both the web view and web controller.
- (void)abortLoad;
-// Cancels any load in progress in the web view.
-- (void)abortWebLoad;
// Updates the internal state and informs the delegate that any outstanding load
// operations are cancelled.
- (void)loadCancelled;
@@ -2277,14 +2275,10 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
}
- (void)abortLoad {
- [self abortWebLoad];
- _certVerificationErrors->Clear();
- [self loadCancelled];
-}
-
-- (void)abortWebLoad {
[_webView stopLoading];
[_pendingNavigationInfo setCancelled:YES];
+ _certVerificationErrors->Clear();
+ [self loadCancelled];
}
- (void)loadCancelled {
@@ -5054,7 +5048,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
// process (which may potentially be controller by an attacker) is
// dangerous.
if (web::GetWebClient()->IsAppSpecificURL(_documentURL)) {
- [self abortWebLoad];
+ [self abortLoad];
NavigationManager::WebLoadParams params(webViewURL);
[self loadWithParams:params];
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698