Cleanup popup related browser navigation code.

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2011 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/extensions/extension_host.h"
 
 #include <list>
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/popup_menu_helper_mac.h"
 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/view_types.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
@@ skipping 561 matching lines @@
 
 void ExtensionHost::ShowCreatedWindow(int route_id,
                                       WindowOpenDisposition disposition,
                                       const gfx::Rect& initial_pos,
                                       bool user_gesture) {
   TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id);
   if (!contents)
     return;
 
   if (disposition == NEW_POPUP) {
-    // Create a new Browser window of type TYPE_APP_POPUP.
-    // (AddTabContents would otherwise create a window of type TYPE_POPUP).
-    Browser* browser = Browser::CreateForPopup(Browser::TYPE_APP_POPUP,
-                                               contents->profile(),
-                                               contents,
-                                               initial_pos);
-    if (user_gesture)
-      browser->window()->Show();
-    else
-      browser->window()->ShowInactive();
+    // Find a browser with a matching profile for creating a popup.
+    // (If none is found, NULL argument to NavigateParams is valid).
+    Browser* browser = BrowserList::FindBrowserWithType(
+        contents->profile(),
+        Browser::TYPE_NORMAL,
+        false);  // Match incognito exactly.
+    TabContentsWrapper* wrapper = new TabContentsWrapper(contents);
+    browser::NavigateParams params(browser, wrapper);
+    params.disposition = NEW_POPUP;
+    params.window_bounds = initial_pos;
+    params.window_action = browser::NavigateParams::SHOW_WINDOW;
+    params.user_gesture = user_gesture;
+    browser::Navigate(&params);
     return;
   }
 
   // If the tab contents isn't a popup, it's a normal tab. We need to find a
   // home for it. This is typically a Browser, but it can also be some other
   // TabContentsDelegate in the case of ChromeFrame.
 
   // First, if the creating extension view was associated with a tab contents,
   // use that tab content's delegate. We must be careful here that the
   // associated tab contents has the same profile as the new tab contents. In
@@ skipping 207 matching lines @@
   return window_id;
 }
 
 void ExtensionHost::OnRunFileChooser(
     const ViewHostMsg_RunFileChooser_Params& params) {
   if (file_select_helper_.get() == NULL)
     file_select_helper_.reset(new FileSelectHelper(profile()));
   file_select_helper_->RunFileChooser(render_view_host_,
                                       associated_tab_contents(), params);
 }