Index: chrome/browser/sessions/session_restore.cc |
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc |
index f7f5a1eefff4feb3f8912d4ad044e0430bca4f16..f358c7d9f69fd826f62d9fc2978d9d7a95fe1a8e 100644 |
--- a/chrome/browser/sessions/session_restore.cc |
+++ b/chrome/browser/sessions/session_restore.cc |
@@ -602,7 +602,7 @@ class SessionRestoreImpl : public content::NotificationObserver { |
for (std::vector<const SessionWindow*>::const_iterator i = begin; |
i != end; ++i) { |
Browser* browser = CreateRestoredBrowser( |
- static_cast<Browser::Type>((*i)->type), |
+ SessionService::BrowserTypeForWindowType((*i)->type), |
(*i)->bounds, |
(*i)->show_state, |
(*i)->app_name); |
@@ -846,9 +846,9 @@ class SessionRestoreImpl : public content::NotificationObserver { |
for (std::vector<SessionWindow*>::iterator i = windows->begin(); |
i != windows->end(); ++i) { |
Browser* browser = NULL; |
- if (!has_tabbed_browser && (*i)->type == Browser::TYPE_TABBED) |
+ if (!has_tabbed_browser && (*i)->type == SessionWindow::TYPE_TABBED) |
has_tabbed_browser = true; |
- if (i == windows->begin() && (*i)->type == Browser::TYPE_TABBED && |
+ if (i == windows->begin() && (*i)->type == SessionWindow::TYPE_TABBED && |
browser_ && browser_->is_type_tabbed() && |
!browser_->profile()->IsOffTheRecord()) { |
// The first set of tabs is added to the existing browser. |
@@ -865,7 +865,7 @@ class SessionRestoreImpl : public content::NotificationObserver { |
has_visible_browser = true; |
} |
browser = CreateRestoredBrowser( |
- static_cast<Browser::Type>((*i)->type), |
+ SessionService::BrowserTypeForWindowType((*i)->type), |
(*i)->bounds, |
show_state, |
(*i)->app_name); |
@@ -874,14 +874,14 @@ class SessionRestoreImpl : public content::NotificationObserver { |
"SessionRestore-CreateRestoredBrowser-End", false); |
#endif |
} |
- if ((*i)->type == Browser::TYPE_TABBED) |
+ if ((*i)->type == SessionWindow::TYPE_TABBED) |
last_browser = browser; |
WebContents* active_tab = |
browser->tab_strip_model()->GetActiveWebContents(); |
int initial_tab_count = browser->tab_strip_model()->count(); |
bool close_active_tab = clobber_existing_tab_ && |
i == windows->begin() && |
- (*i)->type == Browser::TYPE_TABBED && |
+ (*i)->type == SessionWindow::TYPE_TABBED && |
active_tab && browser == browser_ && |
(*i)->tabs.size() > 0; |
if (close_active_tab) |