Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc

Issue 3834002: Make all browser code use browser::Navigate to open tabs.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_ui/filebrowse_ui.cc ('k') | chrome/browser/extensions/extension_tabs_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc
===================================================================
--- chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc (revision 64601)
+++ chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc (working copy)
@@ -5,7 +5,7 @@
#include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_window.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"
@@ -40,11 +40,11 @@
// 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* browser = CreateBrowser();
- Browser::AddTabWithURLParams params(url, transition);
+ browser::NavigateParams params(CreateBrowser(), url, transition);
params.referrer = referrer;
- browser->AddTabWithURL(&params);
- browser->window()->Show();
+ params.disposition = NEW_FOREGROUND_TAB;
+ params.show_window = true;
+ browser::Navigate(&params);
}
}
@@ -59,13 +59,14 @@
WindowOpenDisposition disposition, const gfx::Rect& initial_pos,
bool user_gesture) {
if (profile_) {
- // Force this to open in a new window, too. Code adapted from
- // Browser::AddNewContents() with disposition == NEW_WINDOW.
- Browser* browser = CreateBrowser();
- static_cast<TabContentsDelegate*>(browser)->
- AddNewContents(source, new_contents, NEW_FOREGROUND_TAB,
- initial_pos, user_gesture);
- browser->window()->Show();
+ // 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);
+ params.source_contents = source;
+ params.disposition = NEW_FOREGROUND_TAB;
+ params.window_bounds = initial_pos;
+ params.show_window = true;
+ browser::Navigate(&params);
}
}
« no previous file with comments | « chrome/browser/dom_ui/filebrowse_ui.cc ('k') | chrome/browser/extensions/extension_tabs_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698