From cecc93a46dd560fe4157af3d098092eb395324d3 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Tue, 5 Oct 2010 15:58:55 +0000 Subject: 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 --- chrome/browser/sessions/session_restore.cc | 6 ++++-- chrome/browser/sessions/session_restore_browsertest.cc | 15 ++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'chrome/browser/sessions') diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index e0b49cd..46047a6 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -551,8 +551,10 @@ class SessionRestoreImpl : public NotificationObserver { if (i == 0) add_types |= TabStripModel::ADD_SELECTED; int index = browser->GetIndexForInsertionDuringRestore(i); - browser->AddTabWithURL(urls[i], GURL(), PageTransition::START_PAGE, index, - add_types, NULL, std::string(), NULL); + Browser::AddTabWithURLParams params(urls[i], PageTransition::START_PAGE); + params.index = index; + params.add_types = add_types; + browser->AddTabWithURL(¶ms); } } diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 19cf744..8bc0c2d 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -76,18 +76,15 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { FilePath(FILE_PATH_LITERAL("title3.html")))); // Add and navigate three tabs. - Browser* browser_used = NULL; ui_test_utils::NavigateToURL(browser(), url1); - browser()->AddTabWithURL(url2, GURL(), PageTransition::LINK, 1, - TabStripModel::ADD_SELECTED, NULL, std::string(), - &browser_used); - EXPECT_EQ(browser(), browser_used); + Browser::AddTabWithURLParams params1(url2, PageTransition::LINK); + browser()->AddTabWithURL(¶ms1); + EXPECT_EQ(browser(), params1.target); ui_test_utils::WaitForNavigationInCurrentTab(browser()); - browser()->AddTabWithURL(url3, GURL(), PageTransition::LINK, 2, - TabStripModel::ADD_SELECTED, NULL, std::string(), - &browser_used); - EXPECT_EQ(browser(), browser_used); + Browser::AddTabWithURLParams params2(url3, PageTransition::LINK); + browser()->AddTabWithURL(¶ms2); + EXPECT_EQ(browser(), params2.target); ui_test_utils::WaitForNavigationInCurrentTab(browser()); TabRestoreService* service = browser()->profile()->GetTabRestoreService(); -- cgit v1.1