Refactor callbacks for opening a new window.

ios/chrome/browser/tabs/tab.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/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 354 matching lines @@
 
 // Handles exportable files if possible.
 - (void)handleExportableFile:(net::HttpResponseHeaders*)headers;
 
 // Called after the session history is replaced, useful for updating members
 // with new sessionID.
 - (void)didReplaceSessionHistory;
 
 // Called when the UIApplication's state becomes active.
 - (void)applicationDidBecomeActive;
+
+// Returns YES if popups requested by a page with |URL| should be blocked.
+- (BOOL)shouldBlockPopupForPageWithURL:(const GURL&)URL;
+
+// Blocks popup for page with |popupURL|, requested by the page with
+// |openerURL|.
+- (void)blockPopupForURL:(const GURL&)popupURL openerURL:(const GURL&)openerURL;
+
 @end
 
 namespace {
 // TabHistoryContext is used by history to scope the lifetime of navigation
 // entry references to Tab.
 class TabHistoryContext : public history::Context {
  public:
   TabHistoryContext() {}
   ~TabHistoryContext() {}
 
@@ skipping 1071 matching lines @@
   if (requireReloadAfterBecomingActive_) {
     if (visible_) {
       [self.webController reload];
     } else {
       [self.webController requirePageReload];
     }
     requireReloadAfterBecomingActive_ = NO;
   }
 }
 
+- (BOOL)shouldBlockPopupForPageWithURL:(const GURL&)URL {

[rohitrao (ping after 24h), 2017/02/17 19:53:16]

Both of these methods should eventually move out of Tab and into
BlockedPopupTabHelper.

[Eugene But (OOO till 7-30), 2017/02/17 20:48:55]

Yeah, I think both are doable

+  HostContentSettingsMap* settingMap =
+      ios::HostContentSettingsMapFactory::GetForBrowserState(browserState_);
+  ContentSetting setting = settingMap->GetContentSetting(
+      URL, URL, CONTENT_SETTINGS_TYPE_POPUPS, std::string());
+  return setting != CONTENT_SETTING_ALLOW;
+}
+
+- (void)blockPopupForURL:(const GURL&)popupURL
+               openerURL:(const GURL&)openerURL {
+  web::NavigationItem* item = [self navigationManager]->GetLastCommittedItem();
+  web::Referrer referrer(openerURL, item->GetReferrer().policy);
+  GURL localPopupURL(popupURL);
+  base::WeakNSObject<Tab> weakSelf(self);
+  // TODO(crbug.com/692117): Remove |window_name| from constructor.
+  web::BlockedPopupInfo poupInfo(popupURL, referrer, nil /* window_name */, ^{
+    base::scoped_nsobject<Tab> strongSelf([weakSelf retain]);
+    if (!strongSelf) {
+      return;
+    }
+    [strongSelf updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
+    [strongSelf.get()->parentTabModel_
+        insertOrUpdateTabWithURL:localPopupURL
+                        referrer:referrer
+                      transition:ui::PAGE_TRANSITION_LINK
+                      windowName:nil
+                          opener:self
+                     openedByDOM:YES
+                         atIndex:TabModelConstants::kTabPositionAutomatically
+                    inBackground:NO];
+  });
+  BlockedPopupTabHelper::FromWebState(self.webState)->HandlePopup(poupInfo);
+}
+
 #pragma mark -
 #pragma mark FindInPageControllerDelegate
 
 - (void)willAdjustScrollPosition {
   // Skip the next attempt to correct the scroll offset for the toolbar height.
   // Used when programatically scrolling down the y offset.
   [fullScreenController_ shouldSkipNextScrollOffsetForHeader];
 }
 
 #pragma mark -
@@ skipping 95 matching lines @@
   snapshotOverlayProvider_.reset(snapshotOverlayProvider);
 }
 
 - (void)evaluateU2FResultFromURL:(const GURL&)URL {
   DCHECK(U2FController_);
   [U2FController_ evaluateU2FResultFromU2FURL:URL webState:self.webState];
 }
 
 #pragma mark - CRWWebDelegate and CRWWebStateObserver protocol methods.
 
-- (CRWWebController*)webPageOrderedOpen:(const GURL&)URL
-                               referrer:(const web::Referrer&)referrer
-                             windowName:(NSString*)windowName
-                           inBackground:(BOOL)inBackground {
-  DCHECK(parentTabModel_);
-  if (!inBackground)
-    [self updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
-  // Open a new tab or update an existing one. Tabs opened from a web page are
-  Tab* tab = [parentTabModel_
-      insertOrUpdateTabWithURL:URL
-                      referrer:referrer
-                    transition:ui::PAGE_TRANSITION_LINK
-                    windowName:windowName
-                        opener:self
-                   openedByDOM:YES
-                       atIndex:TabModelConstants::kTabPositionAutomatically
-                  inBackground:inBackground];
-  return tab.webController;
-}
-
-// This can be combined with the other versions once Tab loading is separated
-// from creation.
-- (CRWWebController*)webPageOrderedOpen {
-  [self updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
-
-  Tab* tab = [parentTabModel_
-      insertBlankTabWithTransition:ui::PAGE_TRANSITION_LINK
-                            opener:self
-                       openedByDOM:YES
-                           atIndex:TabModelConstants::kTabPositionAutomatically
-                      inBackground:NO];
-  return tab.webController;
-}
-
 // The web page wants to close its own window.
 - (void)webPageOrderedClose {
   // Only allow a web page to close itself if it was opened by DOM, or if there
   // are no navigation items.
   DCHECK([[self navigationManager]->GetSessionController() isOpenedByDOM] ||
          ![self navigationManager]->GetItemCount());
   [self closeThisTab];
 }
 
 // This method is invoked whenever the system believes the URL is about to
@@ skipping 352 matching lines @@
 
 - (void)setWebUsageEnabled:(BOOL)webUsageEnabled {
   [self.webController setWebUsageEnabled:webUsageEnabled];
 }
 
 - (void)webControllerDidSuppressDialog:(id)webController {
   DCHECK(isPrerenderTab_);
   [delegate_ discardPrerender];
 }
 
-- (BOOL)webController:(CRWWebController*)webController
-    shouldBlockPopupWithURL:(const GURL&)popupURL
-                  sourceURL:(const GURL&)sourceURL {
-  ContentSetting setting =
-      ios::HostContentSettingsMapFactory::GetForBrowserState(browserState_)
-          ->GetContentSetting(sourceURL, sourceURL,
-                              CONTENT_SETTINGS_TYPE_POPUPS, std::string());
+- (CRWWebController*)webController:(CRWWebController*)webController
+         createWebControllerForURL:(const GURL&)URL
+                         openerURL:(const GURL&)openerURL
+                   initiatedByUser:(BOOL)initiatedByUser {
+  BOOL shouldBlockPopUp =
+      !initiatedByUser && [self shouldBlockPopupForPageWithURL:openerURL];
 
-  return setting != CONTENT_SETTING_ALLOW;
-}
+  if (shouldBlockPopUp) {
+    [self blockPopupForURL:URL openerURL:openerURL];
+    return nil;
+  }
 
-- (void)webController:(CRWWebController*)webController
-        didBlockPopup:(const web::BlockedPopupInfo&)blockedPopupInfo {
-  BlockedPopupTabHelper::FromWebState(self.webState)
-      ->HandlePopup(blockedPopupInfo);
+  [self updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
+  Tab* tab = [parentTabModel_
+      insertBlankTabWithTransition:ui::PAGE_TRANSITION_LINK
+                            opener:self
+                       openedByDOM:YES
+                           atIndex:TabModelConstants::kTabPositionAutomatically
+                      inBackground:NO];
+  return tab.webController;
 }
 
 - (CGFloat)headerHeightForWebController:(CRWWebController*)webController {
   return [self.tabHeadersDelegate headerHeightForTab:self];
 }
 
 - (void)webControllerDidUpdateSSLStatusForCurrentNavigationItem:
     (CRWWebController*)webController {
   // Disable fullscreen if SSL cert is invalid.
   web::NavigationItem* item = [self navigationManager]->GetTransientItem();
@@ skipping 202 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end