mac: Fix tab dragging visual bug in Yosemite.

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

Index: chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
index c6dfa624f0ef37063166cb708b2cc7b1306d5482..f06e975be50b8fee4b0a58cc6d9664763cba5239 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.mm
@@ -57,11 +57,17 @@
   if ((self = [super initWithWindow:window])) {
     [[self window] setDelegate:self];
 
-    tabContentArea_.reset([[FastResizeView alloc] initWithFrame:
-        NSMakeRect(0, 0, 750, 600)]);
+    chromeContentView_.reset(
+        [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 750, 600)]);

[Scott Hess - ex-Googler, 2014/07/11 18:08:34]

Suggest NSWidth(contentRect) and NSHeight(contentRect) rather than duplicating
magic numbers, as long as you're here.

[erikchen, 2014/07/11 20:48:04]

I pulled out the numbers into a local variable.

+    [chromeContentView_
+        setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+    [[[self window] contentView] addSubview:chromeContentView_];
+
+    tabContentArea_.reset(
+        [[FastResizeView alloc] initWithFrame:[chromeContentView_ bounds]]);
     [tabContentArea_ setAutoresizingMask:NSViewWidthSizable |
                                          NSViewHeightSizable];
-    [[[self window] contentView] addSubview:tabContentArea_];
+    [chromeContentView_ addSubview:tabContentArea_];
 
     tabStripView_.reset([[TabStripView alloc] initWithFrame:
         NSMakeRect(0, 0, 750, 37)]);

[Scott Hess - ex-Googler, 2014/07/11 18:08:34]

Might as well NSWidth() here, too.  I'm sure 37 is a principled choice someone
made at some point :-).

[erikchen, 2014/07/11 20:48:04]

I pulled out the numbers into a local variable.

@@ -81,6 +87,10 @@
   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.
@@ -127,7 +137,7 @@
     [overlayWindow_ setOpaque:NO];
     [overlayWindow_ setDelegate:self];
 
-    originalContentView_ = [window contentView];
+    originalContentView_ = self.chromeContentView;
     [window addChildWindow:overlayWindow_ ordered:NSWindowAbove];
 
     // Explicitly set the responder to be nil here (for restoring later).
@@ -153,7 +163,9 @@
     // 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 contentView] addSubview:originalContentView_
+                          positioned:NSWindowBelow
+                          relativeTo:nil];
     [[window cr_windowView] addSubview:[self tabStripView]];
     [[window cr_windowView] updateTrackingAreas];