Do not create a second NTP on opening a window

New windows are created with an NSUserActivity to load
a URL (that can be chrome://newtabpage) in a new tab.

1. Use openOrReuseTab function to open such activities
to reuse the current tab if it is an NTP
2. avoid opening the default NTP if such an activity
exists as the NTP would flash before the target URL is
loaded.

Bug: 1106738
Change-Id: Ib034d54dc596b9ca5a69046fd71234831f35bd31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302616
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789473}

ios/chrome/browser/ui/main/scene_controller.mm

@@ -368,8 +368,12 @@ const char kMultiWindowOpenInNewWindowHistogram[] =
                .userActivities) {
         if (ActivityIsURLLoad(activity)) {
           UrlLoadParams params = LoadParamsFromActivity(activity);
-          UrlLoadingBrowserAgent::FromBrowser(self.mainInterface.browser)
-              ->Load(params);
+          ApplicationMode mode = params.in_incognito
+                                     ? ApplicationMode::INCOGNITO
+                                     : ApplicationMode::NORMAL;
+          [self openOrReuseTabInMode:mode
+                   withUrlLoadParams:params
+                 tabOpenedCompletion:nil];
         } else if (!activityWithCompletion) {
           // Completion involves user interaction.
           // Only one can be triggered.
@@ -1453,8 +1457,24 @@ const char kMultiWindowOpenInNewWindowHistogram[] =
 
     return YES;
   }
+  BOOL hasPendingURL = NO;
+
+  if (@available(iOS 13, *)) {
+    // Only consider normal mode load as this function always returns NO for
+    // incognito browser.
+    for (NSUserActivity* activity in self.sceneState.connectionOptions
+             .userActivities) {
+      if (ActivityIsURLLoadInNormalMode(activity)) {
+        hasPendingURL = YES;
+        break;
+      }
+    }
+  }
+
+  // If there is a URLLoading activity, avoid opening a new tab as the NTP would
+  // flash before the target URL is loaded.
   return browser->GetWebStateList()->empty() &&
-         !(browser->GetBrowserState()->IsOffTheRecord());
+         !(browser->GetBrowserState()->IsOffTheRecord()) && !hasPendingURL;
 }
 
 #pragma mark - SceneURLLoadingServiceDelegate
@@ -1686,7 +1706,6 @@ const char kMultiWindowOpenInNewWindowHistogram[] =
   }
 }
 
-
 // Checks the target BVC's current tab's URL. If this URL is chrome://newtab,
 // loads |urlLoadParams| in this tab. Otherwise, open |urlLoadParams| in a new
 // tab in the target BVC. |tabDisplayedCompletion| will be called on the new tab

ios/chrome/browser/ui/popup_menu/popup_menu_action_handler.mm

@@ -125,7 +125,7 @@ using base::UserMetricsAction;
       break;
 #endif  // !defined(NDEBUG)
     case PopupMenuActionOpenNewWindow:
-      [self.dispatcher openNewWindowWithActivity:ActivityToOpenNewTab(false)];
+      [self.dispatcher openNewWindowWithActivity:nil];
       break;
     case PopupMenuActionBookmarks:
       RecordAction(UserMetricsAction("MobileMenuAllBookmarks"));

ios/chrome/browser/window_activities/window_activity_helpers.h

@@ -41,10 +41,6 @@ typedef NS_ENUM(NSInteger, WindowActivityOrigin) {
 // Helper functions to create NSUserActivity instances that encode specific
 // actions in the browser, and to decode those actions from those activities.
 
-// Create a new activity that opens a new, empty tab. |in_incognito| indicates
-// if the new tab should be incognito.
-NSUserActivity* ActivityToOpenNewTab(bool in_incognito);
-
 // Create a new activity that opens a new tab, loading |url| with the referrer
 // |referrer|. |in_incognito| indicates if the new tab should be incognito.
 NSUserActivity* ActivityToLoadURL(WindowActivityOrigin origin,
@@ -64,6 +60,10 @@ NSUserActivity* ActivityToMoveTab(NSString* tab_id);
 // new tab page in a new tab).
 bool ActivityIsURLLoad(NSUserActivity* activity);
 
+// true if |activity| is one that indicates a URL load (including loading the
+// new tab page in a new tab) in normal mode.
+bool ActivityIsURLLoadInNormalMode(NSUserActivity* activity);
+
 // true if |activity| is one that indicates a tab move.
 bool ActivityIsTabMove(NSUserActivity* activity);
 

ios/chrome/browser/window_activities/window_activity_helpers.mm

@@ -38,14 +38,6 @@ NSUserActivity* BaseActivityForURLOpening(bool in_incognito) {
 
 }  // namespace
 
-NSUserActivity* ActivityToOpenNewTab(bool in_incognito) {
-  NSUserActivity* activity = BaseActivityForURLOpening(in_incognito);
-  [activity addUserInfoEntriesFromDictionary:@{
-    kURLKey : net::NSURLWithGURL(GURL(kChromeUINewTabURL))
-  }];
-  return activity;
-}
-
 NSUserActivity* ActivityToLoadURL(WindowActivityOrigin origin,
                                   const GURL& url,
                                   const web::Referrer& referrer,
@@ -88,6 +80,10 @@ bool ActivityIsURLLoad(NSUserActivity* activity) {
          [activity.activityType isEqualToString:kLoadIncognitoURLActivityType];
 }
 
+bool ActivityIsURLLoadInNormalMode(NSUserActivity* activity) {
+  return [activity.activityType isEqualToString:kLoadURLActivityType];
+}
+
 bool ActivityIsTabMove(NSUserActivity* activity) {
   return [activity.activityType isEqualToString:kMoveTabActivityType];
 }