More bookmark bar changes....

chrome/browser/cocoa/tab_window_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_window_controller.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 
 @interface TabWindowController(PRIVATE)
 - (void)setUseOverlay:(BOOL)useOverlay;
 @end
 
 @implementation TabWindowController
 @synthesize tabStripView = tabStripView_;
 @synthesize tabContentArea = tabContentArea_;
 
 - (void)windowDidLoad {
-  // TODO(jrg): a non-normal window (e.g. for pop-ups) needs more work
-  // than just removal of the tab strip offset.  But this is enough to
-  // avoid confusion (e.g. "new tab" on popup gets created in a
-  // different window).
   if ([self isNormalWindow]) {
     // 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 = [tabContentArea_ frame];
     tabFrame.origin = NSMakePoint(0, NSMaxY(tabFrame));
     tabFrame.size.height = NSHeight([tabStripView_ frame]);
     [tabStripView_ setFrame:tabFrame];
+    [[[[self window] contentView] superview] addSubview:tabStripView_];
   }
-  [[[[self window] contentView] superview] addSubview:tabStripView_];
 }
 
 - (void)removeOverlay {
   [self setUseOverlay:NO];
 }
 
 - (void)removeOverlayAfterDelay:(NSTimeInterval)delay {
   [NSObject cancelPreviousPerformRequestsWithTarget:self
                                            selector:@selector(removeOverlay)
                                              object:nil];
@@ skipping 121 matching lines @@
   return @"";
 }
 
 - (BOOL)isNormalWindow {
   // subclass must implement
   NOTIMPLEMENTED();
   return YES;
 }
 
 @end