summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/tab_restore_service.cc
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 12:38:44 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 12:38:44 +0000
commita0a69fd756b858da17e1db581629144f53c3ff30 (patch)
treeef65fba7468f20633ec813319e89b55bf2cf049d /chrome/browser/sessions/tab_restore_service.cc
parent17abeb4103f1de4c00cd4982e9472e064269c8d1 (diff)
downloadchromium_src-a0a69fd756b858da17e1db581629144f53c3ff30.zip
chromium_src-a0a69fd756b858da17e1db581629144f53c3ff30.tar.gz
chromium_src-a0a69fd756b858da17e1db581629144f53c3ff30.tar.bz2
Make TabLoader (session_restore.cc) functional again.
It didn't do anything because Browser::AddRestoredTab was already calling LoadIfNecessary for all the restored tabs (since http://codereview.chromium.org/8678002 ). BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/9503001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/tab_restore_service.cc')
-rw-r--r--chrome/browser/sessions/tab_restore_service.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index b1f7e9d..99e5f4e 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -974,14 +974,16 @@ TabRestoreServiceDelegate* TabRestoreService::RestoreTab(
tab_index = delegate->GetTabCount();
}
- delegate->AddRestoredTab(tab.navigations,
- tab_index,
- tab.current_navigation_index,
- tab.extension_app_id,
- disposition != NEW_BACKGROUND_TAB,
- tab.pinned,
- tab.from_last_session,
- tab.session_storage_namespace);
+ WebContents* web_contents = delegate->AddRestoredTab(
+ tab.navigations,
+ tab_index,
+ tab.current_navigation_index,
+ tab.extension_app_id,
+ disposition != NEW_BACKGROUND_TAB,
+ tab.pinned,
+ tab.from_last_session,
+ tab.session_storage_namespace);
+ web_contents->GetController().LoadIfNecessary();
}
RecordAppLaunch(profile(), tab);
return delegate;