hookup tabs to the model and handle new tab creation

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

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

1 files changed, 11 insertions, 12 deletions

diff --git a/chrome/browser/browser_window_controller.mm b/chrome/browser/browser_window_controller.mm
index 8838a02..33892a3 100644
--- a/chrome/browser/browser_window_controller.mm
+++ b/chrome/browser/browser_window_controller.mm
@@ -6,7 +6,7 @@
 #import "chrome/browser/browser_window_cocoa.h"
 #import "chrome/browser/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_bar_view.h"
-#import "chrome/browser/cocoa/tab_contents_controller.h"
+#import "chrome/browser/cocoa/tab_strip_controller.h"
 
 @implementation BrowserWindowController
 
@@ -16,6 +16,7 @@
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
     browser_ = browser;
+    DCHECK(browser_);
     windowShim_ = new BrowserWindowCocoa(self, [self window]);
   }
   return self;
@@ -25,6 +26,7 @@
   browser_->CloseAllTabs();
   delete browser_;
   delete windowShim_;
+  [tabStripController_ release];
   [contentsController_ release];
   [super dealloc];
 }
@@ -35,6 +37,14 @@
 }
 
 - (void)windowDidLoad {
+  // Create a controller for the tab strip, giving it the model object for
+  // this window's Browser and the tab strip view. The controller will handle
+  // registering for the appropriate tab notifications from the back-end and 
+  // managing the creation of new tabs.
+  tabStripController_ = 
+      [[TabStripController alloc]
+          initWithView:tabBarView_ model:browser_->tabstrip_model()];
+
   // Place the tab bar above the content box and add it to the view hierarchy
   // as a sibling of the content view so it can overlap with the window frame.
   NSRect tabFrame = [contentBox_ frame];
@@ -42,17 +52,6 @@
   tabFrame.size.height = NSHeight([tabBarView_ frame]);
   [tabBarView_ setFrame:tabFrame];
   [[[[self window] contentView] superview] addSubview:tabBarView_];
-
-  // bring in a single copy of the tab contents for now. We'll do this for
-  // real when we hook up the "add tab to browser window" logic flow.
-  // TODO(pinkerton): hook this up to the tab code
-  contentsController_ =
-      [[TabContentsController alloc] initWithNibName:@"TabContents" bundle:nil];
-  NSView* view = [contentsController_ view];
-  NSRect frame = [[[self window] contentView] bounds];
-  frame.size.height -= 14.0;
-  [view setFrame:frame];  
-  [[[self window] contentView] addSubview:view];
 }
 
 - (void)destroyBrowser {