summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
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/sessions
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/sessions')
-rw-r--r--chrome/browser/sessions/session_restore.cc6
-rw-r--r--chrome/browser/sessions/session_restore_browsertest.cc15
2 files changed, 10 insertions, 11 deletions
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(&params);
}
}
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(&params1);
+ 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(&params2);
+ EXPECT_EQ(browser(), params2.target);
ui_test_utils::WaitForNavigationInCurrentTab(browser());
TabRestoreService* service = browser()->profile()->GetTabRestoreService();