Index: chrome/browser/sessions/session_restore.cc |
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc |
index 19abe46125faca8572fe75ab50048f17d137b145..3de36252e12e05e64c7643eaa8365e127e7e5a1f 100644 |
--- a/chrome/browser/sessions/session_restore.cc |
+++ b/chrome/browser/sessions/session_restore.cc |
@@ -162,9 +162,9 @@ class SessionRestoreImpl : public content::NotificationObserver { |
// Create a browser instance to put the restored tabs in. |
for (std::vector<const sessions::SessionWindow*>::const_iterator i = begin; |
i != end; ++i) { |
- Browser* browser = |
- CreateRestoredBrowser(BrowserTypeForWindowType((*i)->type), |
- (*i)->bounds, (*i)->show_state, (*i)->app_name); |
+ Browser* browser = CreateRestoredBrowser( |
+ BrowserTypeForWindowType((*i)->type), (*i)->bounds, (*i)->workspace, |
+ (*i)->show_state, (*i)->app_name); |
browsers.push_back(browser); |
// Restore and show the browser. |
@@ -411,9 +411,9 @@ class SessionRestoreImpl : public content::NotificationObserver { |
show_state = ui::SHOW_STATE_NORMAL; |
has_visible_browser = true; |
} |
- browser = |
- CreateRestoredBrowser(BrowserTypeForWindowType((*i)->type), |
- (*i)->bounds, show_state, (*i)->app_name); |
+ browser = CreateRestoredBrowser(BrowserTypeForWindowType((*i)->type), |
+ (*i)->bounds, (*i)->workspace, |
+ show_state, (*i)->app_name); |
#if defined(OS_CHROMEOS) |
chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker( |
"SessionRestore-CreateRestoredBrowser-End", false); |
@@ -619,6 +619,7 @@ class SessionRestoreImpl : public content::NotificationObserver { |
Browser* CreateRestoredBrowser(Browser::Type type, |
gfx::Rect bounds, |
+ const std::string& workspace, |
ui::WindowShowState show_state, |
const std::string& app_name) { |
Browser::CreateParams params(type, profile_); |
@@ -630,6 +631,7 @@ class SessionRestoreImpl : public content::NotificationObserver { |
params.initial_bounds = bounds; |
} |
params.initial_show_state = show_state; |
+ params.initial_workspace = workspace; |
params.is_session_restore = true; |
return new Browser(params); |
} |