cros: Fix restoring session windows after crash inconsistent minimized window counts

chrome/browser/sessions/session_restore.cc

 // Copyright 2012 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 <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 540 matching lines @@
         contents->SetLastActiveTime(now - delta);
 
         RestoredTab restored_tab(contents, is_selected_tab,
                                  tab.extension_app_id.empty(), tab.pinned);
         created_contents->push_back(restored_tab);
 
         // If this isn't the selected tab, there's nothing else to do.
         if (!is_selected_tab)
           continue;
 
-        ShowBrowser(browser, browser->tab_strip_model()->GetIndexOfWebContents(
-                                 contents));
+        ShowBrowser(browser,
+                    browser->tab_strip_model()->GetIndexOfWebContents(contents),
+                    window.show_state);
         // TODO(sky): remove. For debugging 368236.
         CHECK_EQ(browser->tab_strip_model()->GetActiveWebContents(), contents);
       }
     } else {
       // If the browser already has tabs, we want to restore the new ones after
       // the existing ones. E.g. this happens in Win8 Metro where we merge
       // windows or when launching a hosted app from the app launcher.
       int tab_index_offset = initial_tab_count;
       for (int i = 0; i < static_cast<int>(window.tabs.size()); ++i) {
         const sessions::SessionTab& tab = *(window.tabs[i]);
@@ skipping 57 matching lines @@
                                  ui::WindowShowState show_state,
                                  const std::string& app_name) {
     Browser::CreateParams params(type, profile_, false);
     if (!app_name.empty()) {
       const bool trusted_source = true;  // We only store trusted app windows.
       params = Browser::CreateParams::CreateForApp(app_name, trusted_source,
                                                    bounds, profile_, false);
     } else {
       params.initial_bounds = bounds;
     }
     params.initial_show_state = show_state;

[sky, 2017/02/23 03:37:37]

The show state is plumbed through here. Is the Show() call somehow triggering
ignoring the intial_show_state?

[Qiang(Joe) Xu, 2017/02/23 20:53:14]

show states are all right. The ps1's remedy seems not the root cause. It is
because |browser_| not null for bug case. Then it could be a show-state-mismatch
between |browser_| and the browser that the first set of tabs belonged to.

     params.initial_workspace = workspace;
     params.is_session_restore = true;
     return new Browser(params);
   }
 
-  void ShowBrowser(Browser* browser, int selected_tab_index) {
+  void ShowBrowser(Browser* browser,
+                   int selected_tab_index,
+                   ui::WindowShowState show_state) {
     DCHECK(browser);
     DCHECK(browser->tab_strip_model()->count());
     browser->tab_strip_model()->ActivateTabAt(selected_tab_index, true);
 
-    if (browser_ == browser)
-      return;
-
-    browser->window()->Show();
+    show_state == ui::SHOW_STATE_MINIMIZED ? browser->window()->Minimize()
+                                           : browser->window()->Show();
     browser->set_is_session_restore(false);
 
     // TODO(jcampan): http://crbug.com/8123 we should not need to set the
     //                initial focus explicitly.
     browser->tab_strip_model()->GetActiveWebContents()->SetInitialFocus();
   }
 
   // Appends the urls in |urls| to |browser|.
   void AppendURLsToBrowser(Browser* browser, const std::vector<GURL>& urls) {
     for (size_t i = 0; i < urls.size(); ++i) {
@@ skipping 179 matching lines @@
 // static
 SessionRestore::CallbackSubscription
     SessionRestore::RegisterOnSessionRestoredCallback(
         const base::Callback<void(int)>& callback) {
   return on_session_restored_callbacks()->Add(callback);
 }
 
 // static
 base::CallbackList<void(int)>*
     SessionRestore::on_session_restored_callbacks_ = nullptr;