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

chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 549 matching lines @@
   // While we move views (and focus) around, disable any bar visibility changes.
   [self disableBarVisibilityUpdates];
 
   // Retain the tab strip view while we remove it from its superview.
   base::scoped_nsobject<NSView> tabStripView;
   if ([self hasTabStrip]) {
     tabStripView.reset([[self tabStripView] retain]);
     [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.
   [sourceWindow setDelegate:nil];
   [destWindow setDelegate:self];
 
   // With this call, valgrind complains that a "Conditional jump or move depends
   // on uninitialised value(s)".  The error happens in -[NSThemeFrame
   // 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]) {
     NSView* avatarButtonView = [avatarButtonController_ view];
 
     [avatarButtonView removeFromSuperview];
     [avatarButtonView setHidden:YES];  // Will be shown in layout.
     [[destWindow cr_windowView] addSubview:avatarButtonView];
   }
 
@@ skipping 285 matching lines @@
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
   // In Yosemite, some combination of the titlebar and toolbar always show in
   // full-screen mode. We do not want either to show. Search for the window that
   // contains the views, and hide it. There is no need to ever unhide the view.
   // http://crbug.com/380235
   if (base::mac::IsOSYosemiteOrLater()) {
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
               isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
-        [[window contentView] setHidden:YES];
+        [window.contentView setHidden:YES];
       }
     }
   }
 
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
   enteringFullscreen_ = NO;
   enteringPresentationMode_ = NO;
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 65 matching lines @@
     return;
   [presentationModeController_ ensureOverlayHiddenWithAnimation:animation
                                                           delay:delay];
 }
 
 - (CGFloat)toolbarDividerOpacity {
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
 - (void)updateSubviewZOrder:(BOOL)inPresentationMode {
-  NSView* contentView = self.chromeContentView;
+  NSView* contentView = [[self window] contentView];
   NSView* toolbarView = [toolbarController_ view];
 
   if (inPresentationMode) {
     // Toolbar is above tab contents so that it can slide down from top of
     // screen.
     [contentView cr_ensureSubview:toolbarView
                      isPositioned:NSWindowAbove
                        relativeTo:[self tabContentArea]];
   } else {
     // Toolbar is below tab contents so that the info bar arrow can appear above
@@ skipping 82 matching lines @@
     devTools->SetAllowOverlappingViews(allowOverlappingViews);
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
 }
 
 @end  // @implementation BrowserWindowController(Private)