Make all browser code use browser::Navigate to open tabs....

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_url_handler.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
 // Returns the SiteInstance for |source_contents| if it represents the same
 // website as |url|, or NULL otherwise. |source_contents| cannot be NULL.
 SiteInstance* GetSiteInstance(TabContents* source_contents, const GURL& url) {
+  if (!source_contents)
+    return NULL;
+
   // Don't use this logic when "--process-per-tab" is specified.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab) &&
       SiteInstance::IsSameWebSite(source_contents->profile(),
                                   source_contents->GetURL(),
                                   url)) {
     return source_contents->GetSiteInstance();
   }
   return NULL;
 }
 
@@ skipping 107 matching lines @@
       NOTREACHED();
   }
   return NULL;
 }
 
 // Fix disposition and other parameter values depending on prevailing
 // conditions.
 void NormalizeDisposition(browser::NavigateParams* params) {
   // Calculate the WindowOpenDisposition if necessary.
   if (params->browser->tabstrip_model()->empty() &&
-      params->disposition == NEW_BACKGROUND_TAB) {
+      (params->disposition == NEW_BACKGROUND_TAB ||
+       params->disposition == CURRENT_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;
+
+  // Code that wants to open a new window typically expects it to be shown
+  // automatically.
+  if (params->disposition == NEW_WINDOW || params->disposition == NEW_POPUP) {
+    params->show_window = true;
+    params->tabstrip_add_types |= TabStripModel::ADD_SELECTED;
+  }
 }
 
 // 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 84 matching lines @@
   // 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);
 
+  // Determine if the navigation was user initiated. If it was, we need to
+  // inform the target TabContents, and we may need to update the UI.
+  PageTransition::Type base_transition =
+      PageTransition::StripQualifier(params->transition);
+  bool user_initiated = base_transition == PageTransition::TYPED ||
+                        base_transition == PageTransition::AUTO_BOOKMARK;
+
   // If no target TabContents was specified, we need to construct one if we are
   // supposed to target a new tab.
   if (!params->target_contents) {
     if (params->disposition != CURRENT_TAB) {
       params->target_contents =
           new TabContents(params->browser->profile(),
                           GetSiteInstance(params->source_contents, params->url),
                           MSG_ROUTING_NONE,
                           params->source_contents,
                           NULL);
       // This function takes ownership of |params->target_contents| until it
       // is added to a TabStripModel.
       target_contents_owner.TakeOwnership();
       params->target_contents->SetExtensionAppById(params->extension_app_id);
       // TODO(sky): figure out why this is needed. Without it we seem to get
       // failures in startup tests.
       // By default, content believes it is not hidden.  When adding contents
       // in the background, tell it that it's hidden.
       if ((params->tabstrip_add_types & TabStripModel::ADD_SELECTED) == 0) {
         // TabStripModel::AddTabContents invokes HideContents if not foreground.
         params->target_contents->WasHidden();
       }
     } else {
       // ... otherwise if we're loading in the current tab, the target is the
       // same as the source.
       params->target_contents = params->source_contents;
     }
+
+    if (user_initiated) {
+      RenderViewHostDelegate::BrowserIntegration* integration =
+          params->target_contents;
+      integration->OnUserGesture();
+    }
+
+    // Perform the actual navigation.
+    GURL url = params->url.is_empty() ? params->browser->GetHomePage()
+                                      : params->url;
+    params->target_contents->controller().LoadURL(url, params->referrer,
+                                                  params->transition);
+  } else {
+    // |target_contents| was specified non-NULL, and so we assume it has already
+    // been navigated appropriately. We need to do nothing more other than
+    // add it to the appropriate tabstrip.
   }
 
-  // Determine if the navigation was user initiated. If it was, we need to
-  // inform the target TabContents, and we may need to update the UI.
-  PageTransition::Type base_transition =
-      PageTransition::StripQualifier(params->transition);
-  bool user_initiated = base_transition == PageTransition::TYPED ||
-                        base_transition == PageTransition::AUTO_BOOKMARK;
-  if (user_initiated) {
-    RenderViewHostDelegate::BrowserIntegration* integration =
-        params->target_contents;
-    integration->OnUserGesture();
-  }
-
-  // Perform the actual navigation.
-  GURL url = params->url.is_empty() ? params->browser->GetHomePage()
-                                    : params->url;
-  params->target_contents->controller().LoadURL(url, params->referrer,
-                                                params->transition);
-
   if (params->source_contents == params->target_contents) {
     // The navigation occurred in the source tab, so update the UI.
     params->browser->UpdateUIForNavigationInTab(params->target_contents,
                                                 params->transition,
                                                 user_initiated);
   } else {
     // The navigation occurred in some other tab.
     int singleton_index = GetIndexOfSingletonTab(params);
     if (params->disposition == SINGLETON_TAB && singleton_index >= 0) {
       // The navigation should re-select an existing tab in the target Browser.
       params->browser->SelectTabContentsAt(singleton_index, user_initiated);
     } else {
+      // If some non-default value is set for the index, we should tell the
+      // TabStripModel to respect it.
+      if (params->tabstrip_index != -1)
+        params->tabstrip_add_types |= TabStripModel::ADD_FORCE_INDEX;
+
       // The navigation should insert a new tab into the target Browser.
       params->browser->tabstrip_model()->AddTabContents(
           params->target_contents,
           params->tabstrip_index,
           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