[ios] Improved name of dialogs suppression API.

suppressDialogs is a poor name for a property as its call may be:
[webController suppressDialogs] and will look like an action.

BUG=None

Review URL: https://codereview.chromium.org/1818533002

Cr-Commit-Position: refs/heads/master@{#382111}

3 files changed, 21 insertions, 21 deletions

diff --git a/ios/web/web_state/ui/crw_web_controller.h b/ios/web/web_state/ui/crw_web_controller.h
index d0e1660..be9e86d 100644
--- a/ios/web/web_state/ui/crw_web_controller.h
+++ b/ios/web/web_state/ui/crw_web_controller.h
@@ -124,7 +124,7 @@ class WebStateImpl;
 // YES if JavaScript dialogs, HTTP authentication dialogs and window.open
 // calls should be suppressed. Default is NO. When dialog is suppressed
 // |CRWWebDelegate webControllerDidSuppressDialog:| will be called.
-@property(nonatomic, assign) BOOL suppressDialogs;
+@property(nonatomic, assign) BOOL shouldSuppressDialogs;
 
 // Return an image to use as replacement of a missing snapshot.
 + (UIImage*)defaultSnapshotImage;
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 076227b..c8929bf 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -238,9 +238,9 @@ void CancelTouches(UIGestureRecognizer* gesture_recognizer) {
   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|, calls |setShouldSuppressDialogs:YES| when window id is injected
+  // into the web view.
+  BOOL _shouldSuppressDialogsOnWindowIDInjection;
   // 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
@@ -518,7 +518,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
 @synthesize webUsageEnabled = _webUsageEnabled;
 @synthesize usePlaceholderOverlay = _usePlaceholderOverlay;
 @synthesize loadPhase = _loadPhase;
-@synthesize suppressDialogs = _suppressDialogs;
+@synthesize shouldSuppressDialogs = _shouldSuppressDialogs;
 
 // Implemented by subclasses.
 @dynamic keyboardDisplayRequiresUserAction;
@@ -940,15 +940,15 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   return scrollView.contentOffset.y == -scrollView.contentInset.top;
 }
 
-- (void)setSuppressDialogs:(BOOL)suppressDialogs {
-  _suppressDialogs = suppressDialogs;
+- (void)setShouldSuppressDialogs:(BOOL)shouldSuppressDialogs {
+  _shouldSuppressDialogs = shouldSuppressDialogs;
   if (self.webView) {
     NSString* const kSetSuppressDialogs = [NSString
         stringWithFormat:@"__gCrWeb.setSuppressGeolocationDialogs(%d);",
-                         suppressDialogs];
+                         shouldSuppressDialogs];
     [self evaluateJavaScript:kSetSuppressDialogs stringResultHandler:nil];
   } else {
-    _setSuppressDialogsLater = suppressDialogs;
+    _shouldSuppressDialogsOnWindowIDInjection = shouldSuppressDialogs;
   }
 }
 
@@ -1062,11 +1062,11 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   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) {
-      [self setSuppressDialogs:YES];
-      _setSuppressDialogsLater = NO;
+    // Default value for shouldSuppressDialogs is NO, so updating them only
+    // when necessary is a good optimization.
+    if (_shouldSuppressDialogsOnWindowIDInjection) {
+      self.shouldSuppressDialogs = YES;
+      _shouldSuppressDialogsOnWindowIDInjection = NO;
     }
 
     [_windowIDJSManager inject];
@@ -3195,10 +3195,10 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
 - (void)setPageDialogOpenPolicy:(web::PageDialogOpenPolicy)policy {
   switch (policy) {
     case web::DIALOG_POLICY_ALLOW:
-      [self setSuppressDialogs:NO];
+      self.shouldSuppressDialogs = NO;
       return;
     case web::DIALOG_POLICY_SUPPRESS:
-      [self setSuppressDialogs:YES];
+      self.shouldSuppressDialogs = YES;
       return;
   }
   NOTREACHED();
diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
index 8d79c34..4cb493c 100644
--- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
+++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm
@@ -1205,7 +1205,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
       [space.authenticationMethod isEqual:NSURLAuthenticationMethodNTLM] ||
       [space.authenticationMethod isEqual:NSURLAuthenticationMethodHTTPDigest]);
 
-  if (self.suppressDialogs) {
+  if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     completionHandler(NSURLSessionAuthChallengeRejectProtectionSpace, nil);
     return;
@@ -1977,7 +1977,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
     createWebViewWithConfiguration:(WKWebViewConfiguration*)configuration
                forNavigationAction:(WKNavigationAction*)navigationAction
                     windowFeatures:(WKWindowFeatures*)windowFeatures {
-  if (self.suppressDialogs) {
+  if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     return nil;
   }
@@ -2017,7 +2017,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
     runJavaScriptAlertPanelWithMessage:(NSString*)message
                       initiatedByFrame:(WKFrameInfo*)frame
                      completionHandler:(void(^)())completionHandler {
-  if (self.suppressDialogs) {
+  if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     completionHandler();
     return;
@@ -2042,7 +2042,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
                         initiatedByFrame:(WKFrameInfo*)frame
                        completionHandler:
         (void (^)(BOOL result))completionHandler {
-  if (self.suppressDialogs) {
+  if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     completionHandler(NO);
     return;
@@ -2069,7 +2069,7 @@ WKWebViewErrorSource WKWebViewErrorSourceFromError(NSError* error) {
                          initiatedByFrame:(WKFrameInfo*)frame
                         completionHandler:
         (void (^)(NSString *result))completionHandler {
-  if (self.suppressDialogs) {
+  if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     completionHandler(nil);
     return;