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

chrome/browser/sessions/session_restore.cc

Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index eeafc2d4fed5bd8ac73abeea509a04cf4f662b5f..bc9cdea408b64872c828fcbdf9dd18e822ea3e55 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -399,6 +399,16 @@ class SessionRestoreImpl : public content::NotificationObserver {
         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 &&
@@ -656,7 +666,8 @@ class SessionRestoreImpl : public content::NotificationObserver {
 
     // 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|.