Close the ntp during startup when opening a link on Mac.

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 "apps/app_shim/app_shim_mac.h"
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/app_window_registry.h"
 #include "base/auto_reset.h"
@@ skipping 663 matching lines @@
   CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
   if (!plist) {
     const float fiveHoursInSeconds = 5.0 * 60.0 * 60.0;
     NSNumber* value = [NSNumber numberWithFloat:fiveHoursInSeconds];
     CFPreferencesSetAppValue(checkInterval, value, app);
     CFPreferencesAppSynchronize(app);
   }
 #endif
 }
 
+- (void)openStartupUrls {
+  // TODO(viettrungluu): This is very temporary, since this should be done "in"

[Alexei Svitkine (slow), 2014/04/24 18:59:28]

Nit: Remove the "This is very temporary" part of the comment, since clearly it's
not temporary anymore.

But... does this comment even makes sense anymore? It's suggesting that perhaps
we could handle the URLs much earlier than this. Can we? If I understand your
explanation correctly, it sounds like we can't since we get them pretty late. If
so, perhaps we should replace this comment with an explanation of why this must
be done here (and not earlier).

+  // |BrowserMain()|, i.e., this list of startup URLs should be appended to the
+  // (probably-empty) list of URLs from the command line.
+  if (startupUrls_.empty())
+    return;
+
+  // The browser is already loaded at this point.
+  // If there's only 1 tab and the tab is NTP, close this NTP tab and open all
+  // startup urls in new tabs, because the omnibox will stay focused if we
+  // load url in NTP tab.
+  Browser* browser = chrome::GetLastActiveBrowser();
+  int startupIndex = TabStripModel::kNoTab;
+  content::WebContents* startupContent = NULL;
+
+  if (browser && browser->tab_strip_model()->count() == 1) {
+    startupIndex = browser->tab_strip_model()->active_index();
+    startupContent = browser->tab_strip_model()->GetActiveWebContents();
+  }
+
+  if (startupUrls_.size()) {
+    [self openUrls:startupUrls_];
+    startupUrls_.clear();
+  }
+
+  if (startupIndex != TabStripModel::kNoTab &&
+      startupContent->GetVisibleURL() == GURL(chrome::kChromeUINewTabURL)) {
+    browser->tab_strip_model()->CloseWebContentsAt(startupIndex,
+        TabStripModel::CLOSE_NONE);
+  }
+}
+
 // This is called after profiles have been loaded and preferences registered.
 // It is safe to access the default profile here.
 - (void)applicationDidFinishLaunching:(NSNotification*)notify {
   // Notify BrowserList to keep the application running so it doesn't go away
   // when all the browser windows get closed.
   chrome::IncrementKeepAliveCount();
 
   [self setUpdateCheckInterval];
 
   // Start managing the menu for app windows. This needs to be done here because
@@ skipping 24 matching lines @@
   // I/O.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&RecordLastRunAppBundlePath));
 
   // Makes "Services" menu items available.
   [self registerServicesMenuTypesTo:[notify object]];
 
   startupComplete_ = YES;
 
-  // TODO(viettrungluu): This is very temporary, since this should be done "in"
-  // |BrowserMain()|, i.e., this list of startup URLs should be appended to the
-  // (probably-empty) list of URLs from the command line.
-  if (startupUrls_.size()) {
-    [self openUrls:startupUrls_];
-    [self clearStartupUrls];
-  }
+  [self openStartupUrls];
 
   PrefService* localState = g_browser_process->local_state();
   if (localState) {
     localPrefRegistrar_.Init(localState);
     localPrefRegistrar_.Add(
         prefs::kAllowFileSelectionDialogs,
         base::Bind(&chrome::BrowserCommandController::UpdateOpenFileState,
                    menuState_.get()));
   }
 }
@@ skipping 706 matching lines @@
     }
   }
 
   return dockMenu;
 }
 
 - (const std::vector<GURL>&)startupUrls {
   return startupUrls_;
 }
 
-- (void)clearStartupUrls {
-  startupUrls_.clear();
-}
-
 - (BookmarkMenuBridge*)bookmarkMenuBridge {
   return bookmarkMenuBridge_.get();
 }
 
 - (void)addObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.AddObserver(observer);
 }
 
 - (void)removeObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.RemoveObserver(observer);
@@ skipping 20 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac