[Mac] Insert views into the proper place in the view hierarchy when tearing o...

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)
@@ skipping 42 matching lines @@
                                              object:nil];
   [self performSelector:@selector(removeOverlay)
              withObject:nil
              afterDelay:delay];
 }
 
 - (void)showOverlay {
   [self setUseOverlay:YES];
 }
 
-- (NSArray*)viewsToMoveToOverlay {
-  return [NSArray arrayWithObjects:[self tabStripView],
-            [self tabContentArea], nil];
-}
-
 // if |useOverlay| is true, we're moving views into the overlay's content
 // area. If false, we're moving out of the overlay back into the window's
 // content.
 - (void)moveViewsBetweenWindowAndOverlay:(BOOL)useOverlay {
-  NSView* moveTo = useOverlay ?
-      [overlayWindow_ contentView] : [cachedContentView_ superview];
-  NSArray* viewsToMove = [self viewsToMoveToOverlay];
-  for (NSView* view in viewsToMove)
-    [moveTo addSubview:view];
+  if (useOverlay) {
+    [[[overlayWindow_ contentView] superview] addSubview:[self tabStripView]];
+    // Add the original window's content view as a subview of the overlay
+    // window's content view.  We cannot simply use setContentView: here because
+    // the overlay window has a different content size (due to it being
+    // borderless).
+    [[overlayWindow_ contentView] addSubview:cachedContentView_];
+  } else {
+    [[[[self window] contentView] superview] addSubview:[self tabStripView]];
+    [[self window] setContentView:cachedContentView_];
+  }
 }
 
 // If |useOverlay| is YES, creates a new overlay window and puts the tab strip
 // and the content area inside of it. This allows it to have a different opacity
 // from the title bar. If NO, returns everything to the previous state and
 // destroys the overlay window until it's needed again. The tab strip and window
 // contents are returned to the original window.
 - (void)setUseOverlay:(BOOL)useOverlay {
   [NSObject cancelPreviousPerformRequestsWithTarget:self
                                            selector:@selector(removeOverlay)
                                              object:nil];
   if (useOverlay && !overlayWindow_) {
     DCHECK(!cachedContentView_);
     overlayWindow_ = [[NSPanel alloc] initWithContentRect:[[self window] frame]
                                                 styleMask:NSBorderlessWindowMask
                                                   backing:NSBackingStoreBuffered
                                                     defer:YES];
     [overlayWindow_ setTitle:@"overlay"];
     [overlayWindow_ setBackgroundColor:[NSColor clearColor]];
     [overlayWindow_ setOpaque:NO];
     [overlayWindow_ setDelegate:self];
-    NSView *contentView = [overlayWindow_ contentView];
-    [contentView addSubview:[self tabStripView]];
     cachedContentView_ = [[self window] contentView];
     [self moveViewsBetweenWindowAndOverlay:useOverlay];
     [[self window] addChildWindow:overlayWindow_ ordered:NSWindowAbove];
     [overlayWindow_ orderFront:nil];
   } else if (!useOverlay && overlayWindow_) {
     DCHECK(cachedContentView_);
     [[self window] setContentView:cachedContentView_];
     [self moveViewsBetweenWindowAndOverlay:useOverlay];
     [[self window] makeFirstResponder:cachedContentView_];
     [[self window] display];
@@ skipping 93 matching lines @@
 }
 
 // Tell the window that it needs to call performClose: as soon as the current
 // drag is complete. This prevents a window (and its overlay) from going away
 // during a drag.
 - (void)deferPerformClose {
   closeDeferred_ = YES;
 }
 
 @end