Change window opening behavior for HtmlDialogTabContentsDelegate.

chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc

 // Copyright (c) 2009 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/dom_ui/html_dialog_tab_contents_delegate.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_navigator.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 
 // Incognito profiles are not long-lived, so we always want to store a
 // non-incognito profile.
 //
 // TODO(akalin): Should we make it so that we have a default incognito
 // profile that's long-lived?  Of course, we'd still have to clear it out
 // when all incognito browsers close.
 HtmlDialogTabContentsDelegate::HtmlDialogTabContentsDelegate(Profile* profile)
     : profile_(profile->GetOriginalProfile()) {}
 
 HtmlDialogTabContentsDelegate::~HtmlDialogTabContentsDelegate() {}
 
 Profile* HtmlDialogTabContentsDelegate::profile() const { return profile_; }
 
 void HtmlDialogTabContentsDelegate::Detach() {
   profile_ = NULL;
 }
 
-Browser* HtmlDialogTabContentsDelegate::CreateBrowser() {
-  DCHECK(profile_);
-  return Browser::Create(profile_);
-}
-
 void HtmlDialogTabContentsDelegate::OpenURLFromTab(
     TabContents* source, const GURL& url, const GURL& referrer,
     WindowOpenDisposition disposition, PageTransition::Type transition) {
   if (profile_) {
-    // Force all links to open in a new window, ignoring the incoming
-    // disposition. This is a tabless, modal dialog so we can't just
-    // open it in the current frame.  Code adapted from
-    // Browser::OpenURLFromTab() with disposition == NEW_WINDOW.
-    browser::NavigateParams params(CreateBrowser(), url, transition);
+    // Specify a NULL browser for navigation. This will cause Navigate()
+    // to find a browser matching params.profile or create a new one.
+    Browser* browser = NULL;
+    browser::NavigateParams params(browser, url, transition);
+    params.profile = profile_;
     params.referrer = referrer;
-    params.disposition = NEW_FOREGROUND_TAB;
+    params.disposition = disposition;
     params.show_window = true;
     browser::Navigate(&params);
   }
 }
 
 void HtmlDialogTabContentsDelegate::NavigationStateChanged(
     const TabContents* source, unsigned changed_flags) {
   // We shouldn't receive any NavigationStateChanged except the first
   // one, which we ignore because we're a dialog box.
 }
 
 void HtmlDialogTabContentsDelegate::AddNewContents(
     TabContents* source, TabContents* new_contents,
     WindowOpenDisposition disposition, const gfx::Rect& initial_pos,
     bool user_gesture) {
   if (profile_) {
-    // Force this to open in a new window so that it appears at the top
-    // of the z-index.
-    browser::NavigateParams params(CreateBrowser(), new_contents);
+    // Specify a NULL browser for navigation. This will cause Navigate()
+    // to find a browser matching params.profile or create a new one.
+    Browser* browser = NULL;
+    browser::NavigateParams params(browser, new_contents);
+    params.profile = profile_;
     params.source_contents = source;
-    params.disposition = NEW_FOREGROUND_TAB;
+    params.disposition = disposition;
     params.window_bounds = initial_pos;
     params.show_window = true;
     browser::Navigate(&params);
   }
 }
 
 void HtmlDialogTabContentsDelegate::ActivateContents(TabContents* contents) {
   // We don't do anything here because there's only one TabContents in
   // this frame and we don't have a TabStripModel.
 }
@@ skipping 27 matching lines @@
 void HtmlDialogTabContentsDelegate::UpdateTargetURL(TabContents* source,
                                                     const GURL& url) {
   // Ignored.
 }
 
 bool HtmlDialogTabContentsDelegate::ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     NavigationType::Type navigation_type) {
   return false;
 }
-