Index: chrome/browser/sessions/session_restore.cc |
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc |
index c4c5b2945f89d62e639b6608070fb1dd0c829922..750596e7a93cb7da41c5ca08510a8c0ef4318cb6 100644 |
--- a/chrome/browser/sessions/session_restore.cc |
+++ b/chrome/browser/sessions/session_restore.cc |
@@ -598,6 +598,9 @@ class SessionRestoreImpl : public NotificationObserver { |
// tabbed browsers exist. |
Browser* last_browser = NULL; |
bool has_tabbed_browser = false; |
+ bool has_visible_browser = false; |
+ std::vector<SessionWindow*>::iterator last_window = |
+ windows->begin() + (windows->size() - 1); |
for (std::vector<SessionWindow*>::iterator i = windows->begin(); |
i != windows->end(); ++i) { |
Browser* browser = NULL; |
@@ -613,10 +616,15 @@ class SessionRestoreImpl : public NotificationObserver { |
chromeos::BootTimesLoader::Get()->AddLoginTimeMarker( |
"SessionRestore-CreateRestoredBrowser-Start", false); |
#endif |
+ // Ensure that at least one restored window is visible. |
sky
2011/08/26 22:29:56
The first window to be restored is the window the
dhollowa
2011/08/26 23:18:23
Done. As discussed, we may need to evaluate this
|
+ if ((*i)->show_state != ui::SHOW_STATE_MINIMIZED) |
+ has_visible_browser = true; |
+ ui::WindowShowState show_state = (*i)->show_state; |
+ if (i == last_window && !has_visible_browser) |
+ show_state = ui::SHOW_STATE_NORMAL; |
+ |
browser = CreateRestoredBrowser( |
- static_cast<Browser::Type>((*i)->type), |
- (*i)->bounds, |
- (*i)->show_state); |
+ static_cast<Browser::Type>((*i)->type), (*i)->bounds, show_state); |
#if defined(OS_CHROMEOS) |
chromeos::BootTimesLoader::Get()->AddLoginTimeMarker( |
"SessionRestore-CreateRestoredBrowser-End", false); |