summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_restore.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sessions/session_restore.cc')
-rw-r--r--chrome/browser/sessions/session_restore.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 77cf37e..1321422 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -13,6 +13,7 @@
#include "base/string_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_navigator.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/extensions/extensions_service.h"
@@ -503,10 +504,6 @@ class SessionRestoreImpl : public NotificationObserver {
}
void RestoreTabsToBrowser(const SessionWindow& window, Browser* browser) {
-#if defined(OS_CHROMEOS)
- chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
- "SessionRestore", true);
-#endif
DCHECK(!window.tabs.empty());
for (std::vector<SessionTab*>::const_iterator i = window.tabs.begin();
i != window.tabs.end(); ++i) {
@@ -556,10 +553,12 @@ class SessionRestoreImpl : public NotificationObserver {
if (i == 0)
add_types |= TabStripModel::ADD_SELECTED;
int index = browser->GetIndexForInsertionDuringRestore(i);
- Browser::AddTabWithURLParams params(urls[i], PageTransition::START_PAGE);
- params.index = index;
- params.add_types = add_types;
- browser->AddTabWithURL(&params);
+ browser::NavigateParams params(browser, urls[i],
+ PageTransition::START_PAGE);
+ params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+ params.tabstrip_index = index;
+ params.tabstrip_add_types = add_types;
+ browser::Navigate(&params);
}
}