Revert 98679 - Restoring a session should restore window minimization state on Windows

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
@@ skipping 580 matching lines @@
         "SessionRestore-CreatingTabs-Start", false);
 #endif
     StartTabCreation();
 
     Browser* current_browser =
         browser_ ? browser_ : BrowserList::GetLastActiveWithProfile(profile_);
     // After the for loop this contains the last TABBED_BROWSER. Is null if no
     // tabbed browsers exist.
     Browser* last_browser = NULL;
     bool has_tabbed_browser = false;
-
-    // Determine if there is a visible window.
-    bool has_visible_browser = false;
-    for (std::vector<SessionWindow*>::iterator i = windows->begin();
-         i != windows->end(); ++i) {
-      if ((*i)->show_state != ui::SHOW_STATE_MINIMIZED)
-        has_visible_browser = true;
-    }
-
     for (std::vector<SessionWindow*>::iterator i = windows->begin();
          i != windows->end(); ++i) {
       Browser* browser = NULL;
       if (!has_tabbed_browser && (*i)->type == Browser::TYPE_TABBED)
         has_tabbed_browser = true;
       if (i == windows->begin() && (*i)->type == Browser::TYPE_TABBED &&
           current_browser && current_browser->is_type_tabbed() &&
           !current_browser->profile()->IsOffTheRecord()) {
         // The first set of tabs is added to the existing browser.
         browser = current_browser;
       } else {
 #if defined(OS_CHROMEOS)
     chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
         "SessionRestore-CreateRestoredBrowser-Start", false);
 #endif
-        // Show the first window if none are visible.
-        ui::WindowShowState show_state = (*i)->show_state;
-        if (!has_visible_browser) {
-          show_state = ui::SHOW_STATE_NORMAL;
-          has_visible_browser = true;
-        }
-
         browser = CreateRestoredBrowser(
-            static_cast<Browser::Type>((*i)->type), (*i)->bounds, show_state);
+            static_cast<Browser::Type>((*i)->type),
+            (*i)->bounds,
+            (*i)->show_state);
 #if defined(OS_CHROMEOS)
     chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
         "SessionRestore-CreateRestoredBrowser-End", false);
 #endif
       }
       if ((*i)->type == Browser::TYPE_TABBED)
         last_browser = browser;
       TabContents* active_tab = browser->GetSelectedTabContents();
       int initial_tab_count = browser->tab_count();
       int selected_tab_index = (*i)->selected_tab_index;
@@ skipping 222 matching lines @@
   std::vector<GURL> gurls;
   SessionRestoreImpl restorer(profile,
       static_cast<Browser*>(NULL), true, false, true, gurls);
   restorer.RestoreForeignTab(tab);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }