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 392 matching lines @@
       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.
         browser = browser_;
+
+        // If the existing browser is not nullptr and tabbed, the tabs from the
+        // session window with |active_window_id| should be restored to this
+        // existing browser. Therefore, the existing browser is the
+        // |browser_to_activate|.
+        for (auto j = windows->begin(); j != windows->end(); ++j) {

[sky, 2017/03/07 01:05:36]

It's confusing to have this logic here. Could you do the swap before entering
the loop? Maybe always move the SessionWindow to the front with the active id?

[Qiang(Joe) Xu, 2017/03/07 01:19:31]

Done.

+          if ((*j)->window_id.id() == active_window_id) {
+            std::iter_swap(i, j);
+            break;
+          }
+        }
       } else {
 #if defined(OS_CHROMEOS)
         chromeos::BootTimesRecorder::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;
@@ skipping 226 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;