Revert of mac: Fix tab dragging visual bug in Yosemite. (reland 2)

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 29 matching lines @@
         themeImagePositionForAlignment:alignment];
   }
   return NSZeroPoint;
 }
 
 @end
 
 @implementation TabWindowController
 
 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
-  const CGFloat kDefaultWidth = 750;
-  const CGFloat kDefaultHeight = 600;
-
-  NSRect contentRect = NSMakeRect(60, 229, kDefaultWidth, kDefaultHeight);
+  NSRect contentRect = NSMakeRect(60, 229, 750, 600);
   base::scoped_nsobject<FramedBrowserWindow> window(
       [[FramedBrowserWindow alloc] initWithContentRect:contentRect
                                            hasTabStrip:hasTabStrip]);
   [window setReleasedWhenClosed:YES];
   [window setAutorecalculatesKeyViewLoop:YES];
 
   if ((self = [super initWithWindow:window])) {
     [[self window] setDelegate:self];
 
-    chromeContentView_.reset([[NSView alloc]
-        initWithFrame:NSMakeRect(0, 0, kDefaultWidth, kDefaultHeight)]);
-    [chromeContentView_
-        setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    [[[self window] contentView] addSubview:chromeContentView_];
-
-    tabContentArea_.reset(
-        [[FastResizeView alloc] initWithFrame:[chromeContentView_ bounds]]);
+    tabContentArea_.reset([[FastResizeView alloc] initWithFrame:
+        NSMakeRect(0, 0, 750, 600)]);
     [tabContentArea_ setAutoresizingMask:NSViewWidthSizable |
                                          NSViewHeightSizable];
-    [chromeContentView_ addSubview:tabContentArea_];
+    [[[self window] contentView] addSubview:tabContentArea_];
 
-    tabStripView_.reset([[TabStripView alloc]
-        initWithFrame:NSMakeRect(0, 0, kDefaultWidth, 37)]);
+    tabStripView_.reset([[TabStripView alloc] initWithFrame:
+        NSMakeRect(0, 0, 750, 37)]);
     [tabStripView_ setAutoresizingMask:NSViewWidthSizable |
                                        NSViewMinYMargin];
     if (hasTabStrip)
       [self addTabStripToWindow];
   }
   return self;
 }
 
 - (TabStripView*)tabStripView {
   return tabStripView_;
 }
 
 - (FastResizeView*)tabContentArea {
   return tabContentArea_;
 }
 
-- (NSView*)chromeContentView {
-  return chromeContentView_;
-}
-
 // 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_];
 }
 
@@ skipping 26 matching lines @@
     overlayWindow_ = [[TabWindowOverlayWindow alloc]
                          initWithContentRect:[window frame]
                                    styleMask:NSBorderlessWindowMask
                                      backing:NSBackingStoreBuffered
                                        defer:YES];
     [overlayWindow_ setTitle:@"overlay"];
     [overlayWindow_ setBackgroundColor:[NSColor clearColor]];
     [overlayWindow_ setOpaque:NO];
     [overlayWindow_ setDelegate:self];
 
-    originalContentView_ = self.chromeContentView;
+    originalContentView_ = [window contentView];
     [window addChildWindow:overlayWindow_ ordered:NSWindowAbove];
 
     // Explicitly set the responder to be nil here (for restoring later).
     // If the first responder were to be left non-nil here then
     // [RenderWidgethostViewCocoa resignFirstResponder] would be called,
     // followed by RenderWidgetHost::Blur(), which would result in an unexpected
     // loss of focus.
     focusBeforeOverlay_.reset([[FocusTracker alloc] initWithWindow:window]);
     [window makeFirstResponder:nil];
 
     // Move the original window's tab strip view and content view to the overlay
     // window. The content view is added as a subview of the overlay window's
     // content view (rather than using setContentView:) because the overlay
     // window has a different content size (due to it being borderless).
     [[overlayWindow_ cr_windowView] addSubview:[self tabStripView]];
     [[overlayWindow_ contentView] addSubview:originalContentView_];
 
     [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 contentView] addSubview:originalContentView_
-                          positioned:NSWindowBelow
-                          relativeTo:nil];
-    originalContentView_.frame = [[window contentView] bounds];
+    [window setContentView:originalContentView_];
     [[window cr_windowView] addSubview:[self tabStripView]];
     [[window cr_windowView] updateTrackingAreas];
 
     [focusBeforeOverlay_ restoreFocusInWindow:window];
     focusBeforeOverlay_.reset();
 
     [window display];
     [window removeChildWindow:overlayWindow_];
 
     [overlayWindow_ orderOut:nil];
@@ skipping 125 matching lines @@
   closeDeferred_ = YES;
 }
 
 // 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