[ios] Refactored dialogs suppression.

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <objc/runtime.h>
 #include <stddef.h>
 
 #include <cmath>
@@ skipping 223 matching lines @@
   // The time of the last page transfer start, measured in seconds since Jan 1
   // 2001.
   CFAbsoluteTime _lastTransferTimeInSeconds;
   // Default URL (about:blank).
   GURL _defaultURL;
   // Show overlay view, don't reload web page.
   BOOL _overlayPreviewMode;
   // If |YES|, call setSuppressDialogs when core.js is injected into the web
   // view.
   BOOL _setSuppressDialogsLater;
-  // If |YES|, call setSuppressDialogs when core.js is injected into the web
-  // view.
-  BOOL _setNotifyAboutDialogsLater;
   // The URL of an expected future recreation of the |webView|. Valid
   // only if the web view was discarded for non-user-visible reasons, such that
   // if the next load request is for that URL, it should be treated as a
   // reconstruction that should use cache aggressively.
   GURL _expectedReconstructionURL;
 
   scoped_ptr<web::NewWindowInfo> _externalRequest;
 
   // The WebStateImpl instance associated with this CRWWebController.
   scoped_ptr<WebStateImpl> _webStateImpl;
@@ skipping 169 matching lines @@
 
 // Handles 'addPluginPlaceholders' message.
 - (BOOL)handleAddPluginPlaceholdersMessage:(base::DictionaryValue*)message
                                    context:(NSDictionary*)context;
 // Handles 'chrome.send' message.
 - (BOOL)handleChromeSendMessage:(base::DictionaryValue*)message
                         context:(NSDictionary*)context;
 // Handles 'console' message.
 - (BOOL)handleConsoleMessage:(base::DictionaryValue*)message
                      context:(NSDictionary*)context;
-// Handles 'dialog.suppressed' message.
-- (BOOL)handleDialogSuppressedMessage:(base::DictionaryValue*)message
-                              context:(NSDictionary*)context;
+// Handles 'geolocationDialog.suppressed' message.
+- (BOOL)handleGeolocationDialogSuppressedMessage:(base::DictionaryValue*)message
+                                         context:(NSDictionary*)context;
 // Handles 'document.favicons' message.
 - (BOOL)handleDocumentFaviconsMessage:(base::DictionaryValue*)message
                               context:(NSDictionary*)context;
 // Handles 'document.submit' message.
 - (BOOL)handleDocumentSubmitMessage:(base::DictionaryValue*)message
                             context:(NSDictionary*)context;
 // Handles 'externalRequest' message.
 - (BOOL)handleExternalRequestMessage:(base::DictionaryValue*)message
                              context:(NSDictionary*)context;
 // Handles 'form.activity' message.
@@ skipping 65 matching lines @@
 // Transition to fade snapshot overlay.
 const NSTimeInterval kSnapshotOverlayTransition = 0.5;
 
 }  // namespace
 
 @implementation CRWWebController
 
 @synthesize webUsageEnabled = _webUsageEnabled;
 @synthesize usePlaceholderOverlay = _usePlaceholderOverlay;
 @synthesize loadPhase = _loadPhase;
+@synthesize suppressDialogs = _suppressDialogs;
 
 // Implemented by subclasses.
 @dynamic keyboardDisplayRequiresUserAction;
 
 + (instancetype)allocWithZone:(struct _NSZone*)zone {
   if (self == [CRWWebController class]) {
     // This is an abstract class which should not be instantiated directly.
     // Callers should create concrete subclasses instead.
     NOTREACHED();
     return nil;
@@ skipping 401 matching lines @@
   return self.webScrollView.contentOffset;
 }
 
 - (BOOL)atTop {
   if (!self.webView)
     return YES;
   UIScrollView* scrollView = self.webScrollView;
   return scrollView.contentOffset.y == -scrollView.contentInset.top;
 }
 
+- (void)setSuppressDialogs:(BOOL)flag {

[Jackie Quinn, 2016/03/17 17:46:41]

why "flag" versus something like "supressDialogs"?

[Eugene But (OOO till 7-30), 2016/03/17 17:53:21]

|flag| was shorter, but I guess suppressDialogs would be more consistent with
existing code. Done.

+  _suppressDialogs = flag;
+  if (self.webView) {
+    NSString* const kSetSuppressDialogs = [NSString
+        stringWithFormat:@"__gCrWeb.setSuppressGeolocationDialogs(%d);", flag];
+    [self evaluateJavaScript:kSetSuppressDialogs stringResultHandler:nil];
+  } else {
+    _setSuppressDialogsLater = flag;
+  }
+}
+
 - (void)presentSpoofingError {
   UMA_HISTOGRAM_ENUMERATION("Web.URLVerificationFailure",
                             [self webViewDocumentType],
                             web::WEB_VIEW_DOCUMENT_TYPE_COUNT);
   if (self.webView) {
     [self removeWebViewAllowingCachedReconstruction:NO];
     [_delegate presentSpoofingError];
   }
 }
 
@@ skipping 92 matching lines @@
   }
   [self injectWindowID];
 }
 
 - (void)injectWindowID {
   if (![_windowIDJSManager hasBeenInjected]) {
     // If the window ID wasn't present, this is a new page.
     [self setPageChangeProbability:web::PAGE_CHANGE_PROBABILITY_LOW];
     // Default values for suppressDialogs and notifyAboutDialogs are NO,
     // so updating them only when necessary is a good optimization.
-    if (_setSuppressDialogsLater || _setNotifyAboutDialogsLater) {
-      [self setSuppressDialogs:_setSuppressDialogsLater
-                        notify:_setNotifyAboutDialogsLater];
+    if (_setSuppressDialogsLater) {
+      [self setSuppressDialogs:YES];
       _setSuppressDialogsLater = NO;
-      _setNotifyAboutDialogsLater = NO;
     }
 
     [_windowIDJSManager inject];
     DCHECK([_windowIDJSManager hasBeenInjected]);
   }
 }
 
 // Set the specified recognizer to take priority over any recognizers in the
 // view that have a description containing the specified text fragment.
 + (void)requireGestureRecognizerToFail:(UIGestureRecognizer*)recognizer
@@ skipping 935 matching lines @@
 
 - (SEL)selectorToHandleJavaScriptCommand:(const std::string&)command {
   static std::map<std::string, SEL>* handlers = nullptr;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     handlers = new std::map<std::string, SEL>();
     (*handlers)["addPluginPlaceholders"] =
         @selector(handleAddPluginPlaceholdersMessage:context:);
     (*handlers)["chrome.send"] = @selector(handleChromeSendMessage:context:);
     (*handlers)["console"] = @selector(handleConsoleMessage:context:);
-    (*handlers)["dialog.suppressed"] =
-        @selector(handleDialogSuppressedMessage:context:);
+    (*handlers)["geolocationDialog.suppressed"] =
+        @selector(handleGeolocationDialogSuppressedMessage:context:);
     (*handlers)["document.favicons"] =
         @selector(handleDocumentFaviconsMessage:context:);
     (*handlers)["document.retitled"] =
         @selector(handleDocumentRetitledMessage:context:);
     (*handlers)["document.submit"] =
         @selector(handleDocumentSubmitMessage:context:);
     (*handlers)["externalRequest"] =
         @selector(handleExternalRequestMessage:context:);
     (*handlers)["form.activity"] =
         @selector(handleFormActivityMessage:context:);
@@ skipping 88 matching lines @@
   std::string origin;
   if (!message->GetString("origin", &origin)) {
     DLOG(WARNING) << "JS message parameter not found: origin";
     return NO;
   }
 
   DVLOG(0) << origin << " [" << method << "] " << consoleMessage;
   return YES;
 }
 
-- (BOOL)handleDialogSuppressedMessage:(base::DictionaryValue*)message
-                              context:(NSDictionary*)context {
-  if ([_delegate
-          respondsToSelector:@selector(webControllerDidSuppressDialog:)]) {
-    [_delegate webControllerDidSuppressDialog:self];
-  }
+- (BOOL)handleGeolocationDialogSuppressedMessage:(base::DictionaryValue*)message
+                                         context:(NSDictionary*)context {
+  [self didSuppressDialog];
   return YES;
 }
 
 - (BOOL)handleDocumentFaviconsMessage:(base::DictionaryValue*)message
                               context:(NSDictionary*)context {
   base::ListValue* favicons = nullptr;
   if (!message->GetList("favicons", &favicons)) {
     DLOG(WARNING) << "JS message parameter not found: favicons";
     return NO;
   }
@@ skipping 1037 matching lines @@
     _placeholderOverlayView.reset();
     // There are cases when resetting the contentView, above, may happen after
     // the web view has been created. Re-add it here, rather than
     // relying on a subsequent call to loadCurrentURLInWebView.
     if (self.webView) {
       [[self view] addSubview:self.webView];
     }
   }
 }
 
-- (void)internalSuppressDialogs:(BOOL)suppressFlag notify:(BOOL)notifyFlag {
-  NSString* const kSetSuppressDialogs =
-      [NSString stringWithFormat:@"__gCrWeb.setSuppressDialogs(%d, %d);",
-                                 suppressFlag, notifyFlag];
-  [self setSuppressDialogsWithHelperScript:kSetSuppressDialogs];
-}
-
 - (void)setPageDialogOpenPolicy:(web::PageDialogOpenPolicy)policy {
   switch (policy) {
     case web::DIALOG_POLICY_ALLOW:
-      [self setSuppressDialogs:NO notify:NO];
+      [self setSuppressDialogs:NO];
       return;
     case web::DIALOG_POLICY_SUPPRESS:
-      [self setSuppressDialogs:YES notify:YES];
+      [self setSuppressDialogs:YES];
       return;
   }
   NOTREACHED();
 }
 
-- (void)setSuppressDialogs:(BOOL)suppressFlag notify:(BOOL)notifyFlag {
-  if (self.webView && [_earlyScriptManager hasBeenInjected]) {
-    [self internalSuppressDialogs:suppressFlag notify:notifyFlag];
-  } else {
-    _setSuppressDialogsLater = suppressFlag;
-    _setNotifyAboutDialogsLater = notifyFlag;
-  }
-}
-
 #pragma mark -
 #pragma mark Session Information
 
 - (CRWSessionController*)sessionController {
   return _webStateImpl
       ? _webStateImpl->GetNavigationManagerImpl().GetSessionController()
       : nil;
 }
 
 - (CRWSessionEntry*)currentSessionEntry {
@@ skipping 383 matching lines @@
                                              mainDocumentURL:
                                                  linkClicked:)]) {
     return YES;
   }
   return [_delegate webController:self
                     shouldOpenURL:url
                   mainDocumentURL:mainDocumentURL
                       linkClicked:linkClicked];
 }
 
+- (void)didSuppressDialog {
+  if ([_delegate respondsToSelector:@selector(webControllerDidSuppressDialog:)])
+    [_delegate webControllerDidSuppressDialog:self];
+}
+
 - (BOOL)isPutativeMainFrameRequest:(NSURLRequest*)request
                        targetFrame:(const web::FrameInfo*)targetFrame {
   // Determine whether the request is for the main frame using frame info if
   // available. In the case of missing frame info, the request is considered to
   // have originated from the main frame if either of the following is true:
   //   (a) The request's URL matches the request's main document URL
   //   (b) The request's URL resourceSpecifier matches the request's
   //       mainDocumentURL specifier, as is the case upon redirect from http
   //       App Store links to a URL with itms-apps scheme. This appears to be is
   //       App Store specific behavior, specially handled by web view.
@@ skipping 213 matching lines @@
   if ([MIMEType isEqualToString:@"text/html"] ||
       [MIMEType isEqualToString:@"application/xhtml+xml"] ||
       [MIMEType isEqualToString:@"application/xml"]) {
     return web::WEB_VIEW_DOCUMENT_TYPE_HTML;
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 @end