Reintegrate 552 r66225-r66645....

chrome/browser/browser_navigator.cc

 // Copyright (c) 2010 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/browser_navigator.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 96 matching lines @@
   // Calculate the WindowOpenDisposition if necessary.
   if (params->browser->tabstrip_model()->empty() &&
       params->disposition == NEW_BACKGROUND_TAB) {
     params->disposition = NEW_FOREGROUND_TAB;
   }
   if (params->browser->profile()->IsOffTheRecord() &&
       params->disposition == OFF_THE_RECORD) {
     params->disposition = NEW_FOREGROUND_TAB;
   }
 
-  // Disposition trumps add types. ADD_SELECTED is a default, so we need to
-  // remove it if disposition implies the tab is going to open in the
-  // background.
-  if (params->disposition == NEW_BACKGROUND_TAB)
-    params->tabstrip_add_types &= ~TabStripModel::ADD_SELECTED;
+  switch (params->disposition) {
+    case NEW_BACKGROUND_TAB:
+      // Disposition trumps add types. ADD_SELECTED is a default, so we need to
+      // remove it if disposition implies the tab is going to open in the
+      // background.
+      params->tabstrip_add_types &= ~TabStripModel::ADD_SELECTED;
+      break;
+
+    case NEW_WINDOW:
+    case NEW_POPUP:
+      // Code that wants to open a new window typically expects it to be shown
+      // automatically.
+      params->show_window = true;
+      // Fall-through.
+    case NEW_FOREGROUND_TAB:
+    case SINGLETON_TAB:
+      params->tabstrip_add_types |= TabStripModel::ADD_SELECTED;
+      break;
+
+    default:
+      break;
+  }
 }
 
 // This class makes sure the Browser object held in |params| is made visible
 // by the time it goes out of scope, provided |params| wants it to be shown.
 class ScopedBrowserDisplayer {
  public:
   explicit ScopedBrowserDisplayer(browser::NavigateParams* params)
       : params_(params) {
   }
   ~ScopedBrowserDisplayer() {
@@ skipping 69 matching lines @@
       tabstrip_add_types(TabStripModel::ADD_SELECTED),
       show_window(false),
       browser(a_browser) {
   DCHECK(browser);
 }
 
 NavigateParams::~NavigateParams() {
 }
 
 void Navigate(NavigateParams* params, NavigatorDelegate* delegate) {
+  Browser* browser = params->browser;
   DCHECK(delegate);
   params->browser = GetBrowserForDisposition(params);
   if (!params->browser)
     return;
   // Navigate() must not return early after this point.
 
+  if (browser != params->browser &&
+      params->browser->tabstrip_model()->empty()) {
+    // A new window has been created. So it needs to be displayed.
+    params->show_window = true;
+  }
+
   // Make sure the Browser is shown if params call for it.
   ScopedBrowserDisplayer displayer(params);
 
   // Makes sure any TabContents created by this function is destroyed if
   // not properly added to a tab strip.
   ScopedTargetContentsOwner target_contents_owner(params);
 
   // Some dispositions need coercion to base types.
   NormalizeDisposition(params);
 
@@ skipping 58 matching lines @@
         params->transition,
         params->tabstrip_add_types);
     // Now that the |params->target_contents| is safely owned by the target
     // Browser's TabStripModel, we can release ownership.
     target_contents_owner.ReleaseOwnership();
   }
 }
 
 }  // namespace browser