Fix jumping/resize/relayout of NTP/webpages when switching between NTP and an...

chrome/browser/tabs/tab_strip_model.cc

 // Copyright (c) 2006-2008 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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stl_util-inl.h"
@@ skipping 89 matching lines @@
     if (foreground) {
       // Forget any existing relationships, we don't want to make things too
       // confusing by having multiple groups active at the same time.
       ForgetAllOpeners();
     }
     // Anything opened by a link we deem to have an opener.
     data->SetGroup(&selected_contents->controller());
   }
   contents_data_.insert(contents_data_.begin() + index, data);
 
+  if (index <= selected_index_) {
+    // If a tab is inserted before the current selected index,
+    // then |selected_index| needs to be incremented.
+    ++selected_index_;
+  }
+
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
       TabInsertedAt(contents, index, foreground));
 
   if (foreground) {
     ChangeSelectedContentsFrom(selected_contents, index, false);
-  } else if (index <= selected_index_) {
-    // If a tab is inserted before the current selected index that is not
-    // foreground, |selected_index| needs to be incremented.
-    ++selected_index_;
   }
 }
 
 void TabStripModel::ReplaceNavigationControllerAt(
     int index, NavigationController* controller) {
   // This appears to be OK with no flicker since no redraw event
   // occurs between the call to add an aditional tab and one to close
   // the previous tab.
   InsertTabContentsAt(index + 1, controller->tab_contents(), true, true);
   std::vector<int> closing_tabs;
@@ skipping 607 matching lines @@
   int index = GetIndexOfTabContents(contents);
   contents_data_.at(index)->opener = &opener->controller();
 }
 
 // static
 bool TabStripModel::OpenerMatches(const TabContentsData* data,
                                   const NavigationController* opener,
                                   bool use_group) {
   return data->opener == opener || (use_group && data->group == opener);
 }