Make sure tab contents get cleaned up and dealloc'd correctly when a tab closes.

Review URL: http://codereview.chromium.org/20117

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9290 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/tab_contents_controller.mm b/chrome/browser/cocoa/tab_contents_controller.mm
index b19dcb1..5ef5a4d 100644
--- a/chrome/browser/cocoa/tab_contents_controller.mm
+++ b/chrome/browser/cocoa/tab_contents_controller.mm
@@ -13,6 +13,12 @@
   return self;
 }
 
+- (void)dealloc {
+  // make sure our contents have been removed from the window
+  [[self view] removeFromSuperview];
+  [super dealloc];
+}
+
 - (void)awakeFromNib {
   [locationBar_ setStringValue:@"http://dev.chromium.org"];
 }
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index eee4cbe..d21a64c 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -109,9 +109,16 @@ class TabStripBridge : public TabStripModelObserver {
   [newView setFrame:frame];
 
   // Remove the old view from the view hierarchy. We know there's only one
-  // child of the contentView because we're the one who put it there.
-  NSView* oldView = [[contentView subviews] objectAtIndex:0];
-  [contentView replaceSubview:oldView with:newView];
+  // child of the contentView because we're the one who put it there. There
+  // may not be any children in the case of a tab that's been closed, in
+  // which case there's no swapping going on.
+  NSArray* subviews = [contentView subviews];
+  if ([subviews count]) {
+    NSView* oldView = [subviews objectAtIndex:0];
+    [contentView replaceSubview:oldView with:newView];
+  } else {
+    [contentView addSubview:newView];
+  }
 }
 
 // Create a new tab view and set its cell correctly so it draws the way we
@@ -239,10 +246,13 @@ class TabStripBridge : public TabStripModelObserver {
 // controller and remove the view from the strip.
 - (void)tabDetachedWithContents:(TabContents*)contents
                         atIndex:(NSInteger)index {
-  // Release the tab contents controller so those views get destroyed.
+  // Release the tab contents controller so those views get destroyed. This
+  // will remove all the tab content Cocoa views from the hierarchy. A
+  // subsequent "select tab" notification will follow from the model. To
+  // tell us what to swap in in its absence.
   NSValue* key = [NSValue valueWithPointer:contents];
   [tabContentsToController_ removeObjectForKey:key];
-  
+
   // Remove the |index|th view from the tab strip
   NSView* tab = [[tabView_ subviews] objectAtIndex:index];
   NSInteger tabWidth = [tab frame].size.width;