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 381 matching lines @@
     // Even if all windows are ui::SHOW_STATE_MINIMIZED, if one of them is the
     // active window it will be made visible by the call to
     // browser_to_activate->window()->Activate() later on in this method.
     bool has_visible_browser = false;
     for (const auto& window : *windows) {
       if (window->show_state != ui::SHOW_STATE_MINIMIZED ||
           window->window_id.id() == active_window_id)
         has_visible_browser = true;
     }
 
+    // Always move the session window with |active_window_id| to the front, so

[sky, 2017/03/07 17:34:19]

Now that I think about it you shouldn't reorder windows. The reason for that is
that windows is ordered based on creation time, and creation ordering can have
effects on the system. For example, on windows there is an accelerator to access
the windows in an application. If you change windows you change creation
ordering and the accelerator won't behave consistently.

[Qiang(Joe) Xu, 2017/03/07 21:17:04]

ok, thanks for the info. Another solution I uploaded right now is, before the
restoring session windows loop, do a loop to check whether |browser_| should
accept the tabs from active window or the first window.

The change is now, if active window exists and tabbed, do not restore first set
of tabs on |browser_|, restore active window's tabs on |browser_| instead.

+    // that if the first session window is restored to the existing tabbed
+    // browser, the existing browser is the |browser_to_activate|.
+    for (auto i = windows->begin(); i != windows->end(); ++i) {
+      if ((*i)->window_id.id() == active_window_id) {
+        std::iter_swap(windows->begin(), i);
+        break;
+      }
+    }
+
     for (auto i = windows->begin(); i != windows->end(); ++i) {
       Browser* browser = nullptr;
       if (!has_tabbed_browser &&
           (*i)->type == sessions::SessionWindow::TYPE_TABBED)
         has_tabbed_browser = true;
       if (i == windows->begin() &&
           (*i)->type == sessions::SessionWindow::TYPE_TABBED && browser_ &&
           browser_->is_type_tabbed() &&
           !browser_->profile()->IsOffTheRecord()) {
         // The first set of tabs is added to the existing browser.
@@ skipping 237 matching lines @@
     browser->tab_strip_model()->ActivateTabAt(selected_tab_index, true);
 
     if (browser_ == browser)
       return;
 
     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();
+    if (browser->window()->IsActive())
+      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) {
       int add_types = TabStripModel::ADD_FORCE_INDEX;
       if (i == 0)
         add_types |= TabStripModel::ADD_ACTIVE;
       chrome::NavigateParams params(browser, urls[i],
                                     ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
@@ skipping 174 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;