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

Unified Diff: chrome/browser/dom_ui/filebrowse_ui.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
Index: chrome/browser/dom_ui/filebrowse_ui.cc
===================================================================
--- chrome/browser/dom_ui/filebrowse_ui.cc (revision 64601)
+++ chrome/browser/dom_ui/filebrowse_ui.cc (working copy)
@@ -21,6 +21,7 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_navigator.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
@@ -696,14 +697,16 @@
Browser* browser = popup ?
Browser::CreateForType(Browser::TYPE_APP_PANEL, profile_) :
BrowserList::GetLastActive();
- Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
- browser->AddTabWithURL(&params);
+ browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
+ params.disposition = NEW_FOREGROUND_TAB;
+ browser::Navigate(&params);
+ // TODO(beng): The following two calls should be automatic by Navigate().
if (popup) {
// TODO(dhg): Remove these from being hardcoded. Allow javascript
// to specify.
- params.target->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
+ params.browser->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
}
- params.target->window()->Show();
+ params.browser->window()->Show();
}
void FilebrowseHandler::SendPicasawebRequest() {
@@ -1061,14 +1064,16 @@
url.append(hashArgument);
}
- Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
- browser->AddTabWithURL(&params);
- params.target->window()->SetBounds(gfx::Rect(kPopupLeft,
- kPopupTop,
- width,
- height));
+ browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
+ params.disposition = NEW_FOREGROUND_TAB;
+ browser::Navigate(&params);
+ // TODO(beng): The following two calls should be automatic by Navigate().
+ params.browser->window()->SetBounds(gfx::Rect(kPopupLeft,
+ kPopupTop,
+ width,
+ height));
- params.target->window()->Show();
+ params.browser->window()->Show();
} else {
browser->window()->Show();
}
« no previous file with comments | « chrome/browser/cocoa/tab_strip_controller.mm ('k') | chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698