Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3054)

Unified Diff: chrome/browser/sessions/session_restore.cc

Issue 15055003: Do not submit: high level overview patch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 3ff94979ed11f6118d5755f63e5fa8ba68ba9ba2..2fa9be05938c260a81fdb5d29218599f8521583b 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -618,21 +618,23 @@ class SessionRestoreImpl : public content::NotificationObserver {
true,
tab.extension_app_id,
NULL,
- tab.user_agent_override);
+ tab.user_agent_override,
+ tab.sync_session_id);
} else {
int tab_index =
use_new_window ? 0 : browser->tab_strip_model()->active_index() + 1;
- WebContents* web_contents = chrome::AddRestoredTab(
- browser,
- tab.navigations,
- tab_index,
- selected_index,
- tab.extension_app_id,
- disposition == NEW_FOREGROUND_TAB, // selected
- tab.pinned,
- true,
- NULL,
- tab.user_agent_override);
+ WebContents* web_contents =
+ chrome::AddRestoredTab(browser,
+ tab.navigations,
+ tab_index,
+ selected_index,
+ tab.extension_app_id,
+ disposition == NEW_FOREGROUND_TAB, // selected
+ tab.pinned,
+ true,
+ NULL,
+ tab.user_agent_override,
+ tab.sync_session_id);
// Start loading the tab immediately.
web_contents->GetController().LoadIfNecessary();
}
@@ -1007,7 +1009,8 @@ class SessionRestoreImpl : public content::NotificationObserver {
tab.pinned,
true,
session_storage_namespace.get(),
- tab.user_agent_override);
+ tab.user_agent_override,
+ tab.sync_session_id);
// Regression check: check that the tab didn't start loading right away. The
// focused tab will be loaded by Browser, and TabLoader will load the rest.
DCHECK(web_contents->GetController().NeedsReload());

Powered by Google App Engine
This is Rietveld 408576698