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 ff592de1be0d091abcce3c220ae9fdd05153b0d0..37bb2121eb98f27d1e2aaed99c8f83da01c9f66c 100644 |
--- a/ios/web/web_state/ui/crw_web_controller.mm |
+++ b/ios/web/web_state/ui/crw_web_controller.mm |
@@ -180,8 +180,6 @@ const char kUMAViewportZoomBugCount[] = "Renderer.ViewportZoomBugCount"; |
const NSUInteger kWebViewTag = 0x3eb71e3; |
// URL scheme for messages sent from javascript for asynchronous processing. |
NSString* const kScriptMessageName = @"crwebinvoke"; |
-// URL scheme for messages sent from javascript for immediate processing. |
-NSString* const kScriptImmediateName = @"crwebinvokeimmediate"; |
// Constants for storing the source of NSErrors received by WKWebViews: |
// - Errors received by |-webView:didFailProvisionalNavigation:withError:| are |
@@ -2630,8 +2628,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
if (!message->GetDictionary("crwCommand", &command)) { |
return NO; |
} |
- if ([scriptMessage.name isEqualToString:kScriptImmediateName] || |
- [scriptMessage.name isEqualToString:kScriptMessageName]) { |
+ if ([scriptMessage.name isEqualToString:kScriptMessageName]) { |
return [self respondToMessage:command |
userIsInteracting:[self userIsInteracting] |
originURL:net::GURLWithNSURL([_webView URL])]; |
@@ -4654,15 +4651,11 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
// Set up the new web view. |
if (webView) { |
base::WeakNSObject<CRWWebController> weakSelf(self); |
- void (^messageHandler)(WKScriptMessage*) = ^(WKScriptMessage* message) { |
+ [messageRouter setScriptMessageHandler:^(WKScriptMessage* message) { |
[weakSelf didReceiveScriptMessage:message]; |
- }; |
- [messageRouter setScriptMessageHandler:messageHandler |
+ } |
name:kScriptMessageName |
webView:webView]; |
- [messageRouter setScriptMessageHandler:messageHandler |
- name:kScriptImmediateName |
- webView:webView]; |
_windowIDJSManager.reset( |
[[CRWJSWindowIDManager alloc] initWithWebView:webView]); |
} else { |