summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui/filebrowse_ui.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 15:58:55 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 15:58:55 +0000
commitcecc93a46dd560fe4157af3d098092eb395324d3 (patch)
tree18e511cec0772c03f0109bb8a24bd9ad95a4e3fd /chrome/browser/dom_ui/filebrowse_ui.cc
parent07efbd20cead99d9b46df250e6e562bf1696cd4b (diff)
downloadchromium_src-cecc93a46dd560fe4157af3d098092eb395324d3.zip
chromium_src-cecc93a46dd560fe4157af3d098092eb395324d3.tar.gz
chromium_src-cecc93a46dd560fe4157af3d098092eb395324d3.tar.bz2
Replace Browser::AddTabWithURL(...) with:
- Browser::AddSelectedTabWithURL(const GURL& url, PageTransition::Type transition) -> A good many callsites just wanted a way to open a tab somewhere and select it. - Browser::AddTabWithURL(AddTabWithURLParams* params) -> For the callsites with specialized needs, this new signature allows the parameter set to change as features are added without having to update a bunch of callers every time. BUG=none TEST=existing unit tests Review URL: http://codereview.chromium.org/3599006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/filebrowse_ui.cc')
-rw-r--r--chrome/browser/dom_ui/filebrowse_ui.cc25
1 files changed, 11 insertions, 14 deletions
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 4d93086..c8fb9ce 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -696,15 +696,14 @@ void FilebrowseHandler::OpenNewWindow(const ListValue* args, bool popup) {
Browser* browser = popup ?
Browser::CreateForType(Browser::TYPE_APP_PANEL, profile_) :
BrowserList::GetLastActive();
- browser->AddTabWithURL(GURL(url), GURL(), PageTransition::LINK, -1,
- TabStripModel::ADD_SELECTED, NULL, std::string(),
- &browser);
+ Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
+ browser->AddTabWithURL(&params);
if (popup) {
// TODO(dhg): Remove these from being hardcoded. Allow javascript
// to specify.
- browser->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
+ params.target->window()->SetBounds(gfx::Rect(0, 0, 400, 300));
}
- browser->window()->Show();
+ params.target->window()->Show();
}
void FilebrowseHandler::SendPicasawebRequest() {
@@ -1062,16 +1061,14 @@ Browser* FileBrowseUI::OpenPopup(Profile* profile,
url.append(hashArgument);
}
- browser->AddTabWithURL(
- GURL(url), GURL(), PageTransition::LINK, -1,
- TabStripModel::ADD_SELECTED, NULL, std::string(),
- &browser);
- browser->window()->SetBounds(gfx::Rect(kPopupLeft,
- kPopupTop,
- width,
- height));
+ Browser::AddTabWithURLParams params(GURL(url), PageTransition::LINK);
+ browser->AddTabWithURL(&params);
+ params.target->window()->SetBounds(gfx::Rect(kPopupLeft,
+ kPopupTop,
+ width,
+ height));
- browser->window()->Show();
+ params.target->window()->Show();
} else {
browser->window()->Show();
}