Merge 286045 "Revert of mac: Fix tab dragging visual bug in Yose..."

chrome/browser/ui/cocoa/browser_window_controller_private.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
===================================================================
--- chrome/browser/ui/cocoa/browser_window_controller_private.mm	(revision 286078)
+++ chrome/browser/ui/cocoa/browser_window_controller_private.mm	(working copy)
@@ -567,10 +567,13 @@
     [tabStripView removeFromSuperview];
   }
 
+  // Ditto for the content view.
+  base::scoped_nsobject<NSView> contentView(
+      [[sourceWindow contentView] retain]);
   // Disable autoresizing of subviews while we move views around. This prevents
   // spurious renderer resizes.
-  [self.chromeContentView setAutoresizesSubviews:NO];
-  [self.chromeContentView removeFromSuperview];
+  [contentView setAutoresizesSubviews:NO];
+  [contentView removeFromSuperview];
 
   // Have to do this here, otherwise later calls can crash because the window
   // has no delegate.
@@ -582,11 +585,8 @@
   // drawOverlayRect:].  I'm pretty convinced this is an Apple bug, but there is
   // no visual impact.  I have been unable to tickle it away with other window
   // or view manipulation Cocoa calls.  Stack added to suppressions_mac.txt.
-  [self.chromeContentView setAutoresizesSubviews:YES];
-  [[destWindow contentView] addSubview:self.chromeContentView
-                            positioned:NSWindowBelow
-                            relativeTo:nil];
-  self.chromeContentView.frame = [[destWindow contentView] bounds];
+  [contentView setAutoresizesSubviews:YES];
+  [destWindow setContentView:contentView];
 
   // Move the incognito badge if present.
   if ([self shouldShowAvatar]) {
@@ -892,7 +892,7 @@
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
               isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
-        [[window contentView] setHidden:YES];
+        [window.contentView setHidden:YES];
       }
     }
   }
@@ -978,7 +978,7 @@
 }
 
 - (void)updateSubviewZOrder:(BOOL)inPresentationMode {
-  NSView* contentView = self.chromeContentView;
+  NSView* contentView = [[self window] contentView];
   NSView* toolbarView = [toolbarController_ view];
 
   if (inPresentationMode) {