Layout the tabs explicitly when creating a background tab. Update to correct ...

chrome/browser/cocoa/tab_strip_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #import "base/sys_string_conversions.h"
 #import "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/bookmark_bar_state_controller.h"
@@ skipping 10 matching lines @@
 - (void)insertTabWithContents:(TabContents*)contents
                       atIndex:(NSInteger)index
                  inForeground:(bool)inForeground;
 - (void)selectTabWithContents:(TabContents*)newContents
              previousContents:(TabContents*)oldContents
                       atIndex:(NSInteger)index
                   userGesture:(bool)wasUserGesture;
 - (void)tabDetachedWithContents:(TabContents*)contents
                         atIndex:(NSInteger)index;
 - (void)tabChangedWithContents:(TabContents*)contents
-                       atIndex:(NSInteger)index;
+                       atIndex:(NSInteger)index
+                   loadingOnly:(BOOL)loading;
 @end
 
 // A C++ bridge class to handle receiving notifications from the C++ tab
 // strip model. Doesn't do much on its own, just sends everything straight
 // to the Cocoa controller.
 class TabStripBridge : public TabStripModelObserver {
  public:
   TabStripBridge(TabStripModel* model, TabStripController* controller);
   ~TabStripBridge();
 
   // Overridden from TabStripModelObserver
   virtual void TabInsertedAt(TabContents* contents,
                              int index,
                              bool foreground);
   virtual void TabDetachedAt(TabContents* contents, int index);
   virtual void TabSelectedAt(TabContents* old_contents,
                              TabContents* new_contents,
                              int index,
                              bool user_gesture);
   virtual void TabMoved(TabContents* contents,
                         int from_index,
                         int to_index);
-  virtual void TabChangedAt(TabContents* contents, int index);
+  virtual void TabChangedAt(TabContents* contents, int index,
+                            bool loading_only);
   virtual void TabStripEmpty();
 
  private:
   TabStripController* controller_;  // weak, owns me
   TabStripModel* model_;  // weak, owned by Browser
 };
 
 @implementation TabStripController
 
 - (id)initWithView:(TabStripView*)view
@@ skipping 202 matching lines @@
                                                bundle:nil
                                              contents:contents
                                              commands:commands_
                                          toolbarModel:toolbarModel_
                                         bookmarkModel:bookmarkModel_]
           autorelease];
   if ([self isBookmarkBarVisible])
     [contentsController toggleBookmarkBar:YES];
   [tabContentsArray_ insertObject:contentsController atIndex:index];
 
-  // Make a new tab and add it to the strip. Keep track of its controller. We
-  // don't call |-layoutTabs| here because it will get called when the new
-  // tab is selected by the tab model.
+  // Make a new tab and add it to the strip. Keep track of its controller.
   TabController* newController = [self newTab];
   [tabArray_ insertObject:newController atIndex:index];
   NSView* newView = [newController view];
   [tabView_ addSubview:newView];
 
   [self setTabTitle:newController withContents:contents];
 
-  // Select the newly created tab if in the foreground
-  if (inForeground)
-    [self swapInTabAtIndex:index];
+  // We don't need to call |-layoutTabs| if the tab will be in the foreground
+  // because it will get called when the new tab is selected by the tab model.
+  if (inForeground) {
+    // [self swapInTabAtIndex:index];

[TVL, 2009/04/06 20:08:12]

why commented out?

[pink (ping after 24hrs), 2009/04/06 20:13:46]

oops, removing that code entirely.

+  } else {
+    [newController setSelected:NO];
+    [self layoutTabs];
+  }
 }
 
 // Called when a notification is received from the model to select a particular
 // tab. Swaps in the toolbar and content area associated with |newContents|.
 - (void)selectTabWithContents:(TabContents*)newContents
              previousContents:(TabContents*)oldContents
                       atIndex:(NSInteger)index
                   userGesture:(bool)wasUserGesture {
   // De-select all other tabs and select the new tab.
   int i = 0;
@@ skipping 37 matching lines @@
 
   // Once we're totally done with the tab, delete its controller
   [tabArray_ removeObjectAtIndex:index];
 
   [self layoutTabs];
 }
 
 // Called when a notification is received from the model that the given tab
 // has been updated.
 - (void)tabChangedWithContents:(TabContents*)contents
-                       atIndex:(NSInteger)index {
+                       atIndex:(NSInteger)index
+                   loadingOnly:(BOOL)loading {
   [self setTabTitle:[tabArray_ objectAtIndex:index] withContents:contents];
 
   TabContentsController* updatedController =
       [tabContentsArray_ objectAtIndex:index];
   [updatedController tabDidChange:contents];
 }
 
 - (LocationBar*)locationBar {
   TabContentsController* selectedController =
       [tabContentsArray_ objectAtIndex:tabModel_->selected_index()];
@@ skipping 107 matching lines @@
                              atIndex:index
                          userGesture:user_gesture];
 }
 
 void TabStripBridge::TabMoved(TabContents* contents,
                               int from_index,
                               int to_index) {
   NOTIMPLEMENTED();
 }
 
-void TabStripBridge::TabChangedAt(TabContents* contents, int index) {
-  [controller_ tabChangedWithContents:contents atIndex:index];
+void TabStripBridge::TabChangedAt(TabContents* contents, int index,
+                                  bool loading_only) {
+  [controller_ tabChangedWithContents:contents
+                              atIndex:index
+                          loadingOnly:loading_only ? YES : NO];
 }
 
 void TabStripBridge::TabStripEmpty() {
   NOTIMPLEMENTED();
 }