Change window opening behavior for HtmlDialogTabContentsDelegate.

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"
@@ skipping 83 matching lines @@
   return -1;
 }
 
 // Returns a Browser that can host the navigation or tab addition specified in
 // |params|. This might just return the same Browser specified in |params|, or
 // some other if that Browser is deemed incompatible.
 Browser* GetBrowserForDisposition(browser::NavigateParams* params) {
   // If no source TabContents was specified, we use the selected one from the
   // target browser. This must happen first, before GetBrowserForDisposition()
   // has a chance to replace |params->browser| with another one.
-  if (!params->source_contents)
+  if (!params->source_contents && params->browser)
     params->source_contents = params->browser->GetSelectedTabContents();
 
+  Profile* profile =
+      params->browser ? params->browser->profile() : params->profile;
+
   switch (params->disposition) {
     case CURRENT_TAB:
+      if (!params->browser && profile) {
+        // We specified a profile instead of a browser; find or create one.
+        params->browser = Browser::GetOrCreateTabbedBrowser(profile);
+      }
       return params->browser;
     case SINGLETON_TAB:
     case NEW_FOREGROUND_TAB:
     case NEW_BACKGROUND_TAB:
       // See if we can open the tab in the window this navigator is bound to.
-      if (WindowCanOpenTabs(params->browser))
+      if (params->browser && WindowCanOpenTabs(params->browser))
         return params->browser;
       // Find a compatible window and re-execute this command in it. Otherwise
       // re-run with NEW_WINDOW.
-      return GetOrCreateBrowser(params->browser->profile());
+      if (profile)
+        return GetOrCreateBrowser(profile);
+      return NULL;
     case NEW_POPUP: {
       // Make a new popup window. Coerce app-style if |params->browser| or the
       // |source| represents an app.
       Browser::Type type = Browser::TYPE_POPUP;
-      if (params->browser->type() == Browser::TYPE_APP ||
+      if ((params->browser && params->browser->type() == Browser::TYPE_APP) ||
           (params->source_contents && params->source_contents->is_app())) {
         type = Browser::TYPE_APP_POPUP;
       }
-      Browser* browser = new Browser(type, params->browser->profile());
-      browser->set_override_bounds(params->window_bounds);
-      browser->CreateBrowserWindow();
-      return browser;
+      if (profile) {
+        Browser* browser = new Browser(type, profile);
+        browser->set_override_bounds(params->window_bounds);
+        browser->CreateBrowserWindow();
+        return browser;
+      }
+      return NULL;
     }
     case NEW_WINDOW:
       // Make a new normal browser window.
-      return Browser::Create(params->browser->profile());
+      if (profile) {
+        Browser* browser = new Browser(Browser::TYPE_NORMAL, profile);
+        browser->CreateBrowserWindow();
+        return browser;
+      }
+      return NULL;
     case OFF_THE_RECORD:
       // Make or find an incognito window.
-      return GetOrCreateBrowser(
-          params->browser->profile()->GetOffTheRecordProfile());
+      if (profile)
+        return GetOrCreateBrowser(profile->GetOffTheRecordProfile());
+      return NULL;
     // The following types all result in no navigation.
     case SUPPRESS_OPEN:
     case SAVE_TO_DISK:
     case IGNORE_ACTION:
       return NULL;
     default:
       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 == CURRENT_TAB)) {
+       params->disposition == CURRENT_TAB ||
+       params->disposition == SINGLETON_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.
@@ skipping 67 matching lines @@
     const GURL& a_url,
     PageTransition::Type a_transition)
     : url(a_url),
       target_contents(NULL),
       source_contents(NULL),
       disposition(CURRENT_TAB),
       transition(a_transition),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_SELECTED),
       show_window(false),
-      browser(a_browser) {
-  DCHECK(browser);
+      browser(a_browser),
+      profile(NULL) {
 }
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                TabContents* a_target_contents)
     : target_contents(a_target_contents),
       source_contents(NULL),
       disposition(CURRENT_TAB),
       transition(PageTransition::LINK),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_SELECTED),
       show_window(false),
-      browser(a_browser) {
-  DCHECK(browser);
+      browser(a_browser),
+      profile(NULL) {
 }
 
 NavigateParams::~NavigateParams() {
 }
 
 void Navigate(NavigateParams* params) {
   params->browser = GetBrowserForDisposition(params);
   if (!params->browser)
     return;
   // Navigate() must not return early after this point.
@@ skipping 34 matching lines @@
       // 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;
+      DCHECK(params->target_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()
@@ skipping 30 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
-