diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 21:24:59 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 21:24:59 +0000 |
| commit | b283a75393c7c54e33ca7d25f9eec55ac6a2960b (patch) | |
| tree | f18455820a1e47b5da8602f7ebc0a99296866e11 /chrome/browser/sessions | |
| parent | 8e07d29abff1de820b4ca5105534f3bcc6a0510d (diff) | |
| download | chromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.zip chromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.tar.gz chromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.tar.bz2 | |
Clone of issue 2941001. See initial review below.
http://codereview.chromium.org/2941001
Initial submit broke the chromeos build. This patch includes the original change, and fixes to compile ChromeOs properly.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/2819086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 6ec5a66..a75f7de 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -523,7 +523,7 @@ class SessionRestoreImpl : public NotificationObserver { add_types |= TabStripModel::ADD_SELECTED; int index = browser->GetIndexForInsertionDuringRestore(i); browser->AddTabWithURL(urls[i], GURL(), PageTransition::START_PAGE, index, - add_types, NULL, std::string()); + add_types, NULL, std::string(), NULL); } } diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index e2752c1..7c594e4 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -75,13 +75,18 @@ 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()); + TabStripModel::ADD_SELECTED, NULL, std::string(), + &browser_used); + EXPECT_EQ(browser(), browser_used); ui_test_utils::WaitForNavigationInCurrentTab(browser()); browser()->AddTabWithURL(url3, GURL(), PageTransition::LINK, 2, - TabStripModel::ADD_SELECTED, NULL, std::string()); + TabStripModel::ADD_SELECTED, NULL, std::string(), + &browser_used); + EXPECT_EQ(browser(), browser_used); ui_test_utils::WaitForNavigationInCurrentTab(browser()); TabRestoreService* service = browser()->profile()->GetTabRestoreService(); |