| 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(¶ms);
|
| + browser::NavigateParams params(browser, GURL(url), PageTransition::LINK);
|
| + params.disposition = NEW_FOREGROUND_TAB;
|
| + browser::Navigate(¶ms);
|
| + // 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(¶ms);
|
| - 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(¶ms);
|
| + // 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();
|
| }
|
|
|