Fix for URL opening code

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 112 matching lines @@
 #if BUILDFLAG(ENABLE_RLZ)
 #include "components/rlz/rlz_tracker.h"  // nogncheck
 #endif
 
 using content::ChildProcessSecurityPolicy;
 using content::WebContents;
 using extensions::Extension;
 
 namespace {
 
+std::vector<GURL>* g_startup_urls = nullptr;
+
 // Utility functions ----------------------------------------------------------
 
 enum LaunchMode {
   LM_TO_BE_DECIDED = 0,       // Possibly direct launch or via a shortcut.
   LM_AS_WEBAPP,               // Launched as a installed web application.
   LM_WITH_URLS,               // Launched with urls in the cmd line.
   LM_SHORTCUT_NONE,           // Not launched from a shortcut.
   LM_SHORTCUT_NONAME,         // Launched from shortcut but no name available.
   LM_SHORTCUT_UNKNOWN,        // Launched from user-defined shortcut.
   LM_SHORTCUT_QUICKLAUNCH,    // Launched from the quick launch bar.
@@ skipping 285 matching lines @@
 
 Browser* StartupBrowserCreatorImpl::OpenURLsInBrowser(
     Browser* browser,
     bool process_startup,
     const std::vector<GURL>& urls) {
   StartupTabs tabs;
   UrlsToTabs(urls, &tabs);
   return OpenTabsInBrowser(browser, process_startup, tabs);
 }
 
+// static
+void StartupBrowserCreatorImpl::OpenURLsAfterSessionRestore(
+    const std::vector<GURL>& urls) {
+  // Save URLs for deferred opening
+  if (!g_startup_urls)
+    g_startup_urls = new std::vector<GURL>();
+  *g_startup_urls = urls;
+}
+
+void StartupBrowserCreatorImpl::OpenDeferredURLs(Browser* browser) {
+  if (g_startup_urls && !g_startup_urls->empty()) {
+    StartupBrowserCreator::in_synchronous_profile_launch_ = true;
+    OpenURLsInBrowser(browser, false, *g_startup_urls);
+    StartupBrowserCreator::in_synchronous_profile_launch_ = false;
+    delete g_startup_urls;
+    g_startup_urls = nullptr;
+  }
+}
+
 Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser,
                                                       bool process_startup,
                                                       const StartupTabs& tabs) {
   DCHECK(!tabs.empty());
 
   // If we don't yet have a profile, try to use the one we're given from
   // |browser|. While we may not end up actually using |browser| (since it
   // could be a popup window), we can at least use the profile.
   if (!profile_ && browser)
     profile_ = browser->profile();
@@ skipping 307 matching lines @@
 Browser* StartupBrowserCreatorImpl::RestoreOrCreateBrowser(
     const StartupTabs& tabs,
     BrowserOpenBehavior behavior,
     SessionRestore::BehaviorBitmask restore_options,
     bool process_startup,
     bool is_post_crash_launch) {
   Browser* browser = nullptr;
   if (behavior == BrowserOpenBehavior::SYNCHRONOUS_RESTORE) {
     browser = SessionRestore::RestoreSession(profile_, nullptr, restore_options,
                                              TabsToUrls(tabs));
-    if (browser)
+    if (browser) {
+      OpenDeferredURLs(browser);
       return browser;
+    }
   } else if (behavior == BrowserOpenBehavior::USE_EXISTING) {
     browser = chrome::FindTabbedBrowser(profile_, process_startup);
   }
 
   base::AutoReset<bool> synchronous_launch_resetter(
       &StartupBrowserCreator::in_synchronous_profile_launch_, true);
 
   // OpenTabsInBrowser requires at least one tab be passed. As a fallback to
   // prevent a crash, use the NTP if |tabs| is empty. This could happen if
   // we expected a session restore to happen but it did not occur/succeed.
@@ skipping 243 matching lines @@
     }
 #endif
 
     std::vector<GURL> adjusted_urls(urls_to_open);
     AddSpecialURLs(&adjusted_urls);
 
     // The startup code only executes for browsers launched in desktop mode. Ash
     // should never get here.
     Browser* browser = SessionRestore::RestoreSession(
         profile_, NULL, restore_behavior, adjusted_urls);
-
+    OpenDeferredURLs(browser);
     AddInfoBarsIfNecessary(browser, chrome::startup::IS_PROCESS_STARTUP);
     return true;
   }
 
   Browser* browser = ProcessSpecifiedURLs(urls_to_open);
+  if (pref.type == SessionStartupPref::URLS) {
+    OpenDeferredURLs(browser);
+  }
   if (!browser)
     return false;
 
   AddInfoBarsIfNecessary(browser, chrome::startup::IS_PROCESS_STARTUP);
 
   // Session restore may occur if the startup preference is "last" or if the
   // crash infobar is displayed. Otherwise, it's safe for the DOM storage system
   // to start deleting leftover data.
   if (pref.type != SessionStartupPref::LAST &&
       !HasPendingUncleanExit(profile_)) {
@@ skipping 211 matching lines @@
 #if defined(OS_WIN)
   TriggeredProfileResetter* triggered_profile_resetter =
       TriggeredProfileResetterFactory::GetForBrowserContext(profile_);
   // TriggeredProfileResetter instance will be nullptr for incognito profiles.
   if (triggered_profile_resetter) {
     has_reset_trigger = triggered_profile_resetter->HasResetTrigger();
   }
 #endif  // defined(OS_WIN)
   return has_reset_trigger;
 }