Fix for URL opening code

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include <stddef.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 1255 matching lines @@
 
 // Various methods to open URLs that we get in a native fashion. We use
 // StartupBrowserCreator here because on the other platforms, URLs to open come
 // through the ProcessSingleton, and it calls StartupBrowserCreator. It's best
 // to bottleneck the openings through that for uniform handling.
 - (void)openUrls:(const std::vector<GURL>&)urls {
   if (!startupComplete_) {
     startupUrls_.insert(startupUrls_.end(), urls.begin(), urls.end());
     return;
   }
-
   Browser* browser = chrome::GetLastActiveBrowser();
+  bool show_browser = false;
   // if no browser window exists then create one with no tabs to be filled in
   if (!browser) {
     browser = new Browser(Browser::CreateParams([self lastProfile], true));
-    browser->window()->Show();
+    show_browser = true;
   }
+  Profile* profile = [self lastProfile];
+  SessionStartupPref pref = StartupBrowserCreator::GetSessionStartupPref(
+      *base::CommandLine::ForCurrentProcess(), profile);
 
-  base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
-  chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
-      chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
-  StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
-  launch.OpenURLsInBrowser(browser, false, urls);
+  if (pref.type == SessionStartupPref::LAST) {
+    // In case of session restore, remember |urls|, so they will be opened
+    // after session is resored, in the tabs next to it.
+    StartupBrowserCreatorImpl::OpenURLsAfterSessionRestore(urls);
+  } else {
+    base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
+    chrome::startup::IsFirstRun first_run =
+        first_run::IsChromeFirstRun() ? chrome::startup::IS_FIRST_RUN
+                                      : chrome::startup::IS_NOT_FIRST_RUN;
+    StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
+    if (show_browser)
+      browser->window()->Show();
+    launch.OpenURLsInBrowser(browser, false, urls);
+  }
 }
 
 - (void)getUrl:(NSAppleEventDescriptor*)event
      withReply:(NSAppleEventDescriptor*)reply {
   NSString* urlStr = [[event paramDescriptorForKeyword:keyDirectObject]
                       stringValue];
 
   GURL gurl(base::SysNSStringToUTF8(urlStr));
   std::vector<GURL> gurlVector;
   gurlVector.push_back(gurl);
@@ skipping 303 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac