mac, yosemite: Resize button causes fullscreen effect.

chrome/browser/ui/cocoa/tabs/tab_window_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/tabs/tab_window_controller.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
@@ skipping 33 matching lines @@
 
 @end
 
 @implementation TabWindowController
 
 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
   NSRect contentRect = NSMakeRect(60, 229, 750, 600);
   base::scoped_nsobject<FramedBrowserWindow> window(
       [[FramedBrowserWindow alloc] initWithContentRect:contentRect
                                            hasTabStrip:hasTabStrip]);
+  [self moveContentViewToBack:[window contentView]];
   [window setReleasedWhenClosed:YES];
   [window setAutorecalculatesKeyViewLoop:YES];
 
   if ((self = [super initWithWindow:window])) {
     [[self window] setDelegate:self];
 
     tabContentArea_.reset([[FastResizeView alloc] initWithFrame:
         NSMakeRect(0, 0, 750, 600)]);
     [tabContentArea_ setAutoresizingMask:NSViewWidthSizable |
                                          NSViewHeightSizable];
     [[[self window] contentView] addSubview:tabContentArea_];
 
     tabStripView_.reset([[TabStripView alloc] initWithFrame:
         NSMakeRect(0, 0, 750, 37)]);
     [tabStripView_ setAutoresizingMask:NSViewWidthSizable |
                                        NSViewMinYMargin];
     if (hasTabStrip)
-      [self addTabStripToWindow];
+      [self insertTabStripView:tabStripView_ intoWindow:[self window]];
   }
   return self;
 }
 
 - (TabStripView*)tabStripView {
   return tabStripView_;
 }
 
 - (FastResizeView*)tabContentArea {
   return tabContentArea_;
 }
 
-// Add the top tab strop to the window, 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.
-- (void)addTabStripToWindow {
-  // The frame doesn't matter. This class relies on subclasses to do tab strip
-  // layout.
-  NSView* contentParent = [[self window] cr_windowView];
-  [contentParent addSubview:tabStripView_];
-}
-
 - (void)removeOverlay {
   [self setUseOverlay:NO];
   if (closeDeferred_) {
     // See comment in BrowserWindowCocoa::Close() about orderOut:.
     [[self window] orderOut:self];
     [[self window] performClose:self];  // Autoreleases the controller.
   }
 }
 
 - (void)showOverlay {
@@ skipping 43 matching lines @@
 
     [overlayWindow_ orderFront:nil];
   } else if (!useOverlay && overlayWindow_) {
     DCHECK(originalContentView_);
 
     // Return the original window's tab strip view and content view to their
     // places. The TabStripView always needs to be in front of the window's
     // content view and therefore it should always be added after the content
     // view is set.
     [window setContentView:originalContentView_];
-    [[window cr_windowView] addSubview:[self tabStripView]];
+    [self moveContentViewToBack:originalContentView_];
+    [self insertTabStripView:[self tabStripView] intoWindow:window];
     [[window cr_windowView] updateTrackingAreas];
 
     [focusBeforeOverlay_ restoreFocusInWindow:window];
     focusBeforeOverlay_.reset();
 
     [window display];
     [window removeChildWindow:overlayWindow_];
 
     [overlayWindow_ orderOut:nil];
     [overlayWindow_ release];
@@ skipping 117 matching lines @@
   return YES;
 }
 
 // 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;
 }
 
+- (void)moveContentViewToBack:(NSView*)cv {
+  base::scoped_nsobject<NSView> contentView([cv retain]);
+  NSView* superview = [contentView superview];
+  [contentView removeFromSuperview];
+  [superview addSubview:contentView positioned:NSWindowBelow relativeTo:nil];
+}
+
+- (void)insertTabStripView:(NSView*)tabStripView intoWindow:(NSWindow*)window {
+  NSView* contentParent = [window cr_windowView];
+  if (contentParent == [[window contentView] superview]) {
+    // Add the tab strip directly above the content view, if they are siblings.
+    [contentParent addSubview:tabStripView
+                   positioned:NSWindowAbove
+                   relativeTo:[window contentView]];
+  } else {
+    [contentParent addSubview:tabStripView];
+  }
+}
+
 // Called when the size of the window content area has changed. Override to
 // position specific views. Base class implementation does nothing.
 - (void)layoutSubviews {
   NOTIMPLEMENTED();
 }
 
 @end