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

chrome/browser/ui/cocoa/version_independent_window.mm

 // Copyright 2014 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/version_independent_window.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 
 @interface VersionIndependentWindow ()
@@ skipping 14 matching lines @@
 
 // This method is directly called by NSWindow during a window resize on OSX
 // 10.10.0, beta 2. We must override it to prevent the content view from
 // shrinking.
 - (void)setFrameSize:(NSSize)size {
   if ([self superview])
     size = [[self superview] bounds].size;
   [super setFrameSize:size];
 }
 
+// The contentView gets moved around during certain full-screen operations.
+// This is less than ideal, and should eventually be removed.
+- (void)viewDidMoveToSuperview {
+  [self setFrame:[[self superview] bounds]];
+}
+
 @end
 
 @implementation NSWindow (VersionIndependentWindow)
 
 - (NSView*)cr_windowView {
   if ([self isKindOfClass:[VersionIndependentWindow class]]) {
     VersionIndependentWindow* window =
         static_cast<VersionIndependentWindow*>(self);
     NSView* chromeWindowView = [window chromeWindowView];
     if (chromeWindowView)
@@ skipping 21 matching lines @@
   self = [super initWithContentRect:contentRect
                           styleMask:windowStyle
                             backing:bufferingType
                               defer:deferCreation];
   if (self) {
     if ([VersionIndependentWindow
         shouldUseFullSizeContentViewForStyle:windowStyle]) {
       chromeWindowView_.reset([[FullSizeContentView alloc] init]);
       [chromeWindowView_
           setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+      [chromeWindowView_ setFrame:[[[self contentView] superview] bounds]];
       [self setContentView:chromeWindowView_];
-      [chromeWindowView_ setFrame:[[[self contentView] superview] bounds]];
     }
   }
   return self;
 }
 
 #pragma mark - Private Methods
 
 + (BOOL)shouldUseFullSizeContentViewForStyle:(NSUInteger)windowStyle {
   return (windowStyle & NSTitledWindowMask) && base::mac::IsOSYosemiteOrLater();
 }
@@ skipping 46 matching lines @@
   return [super contentRectForFrameRect:fRect styleMask:aStyle];
 }
 
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   if (chromeWindowView_)
     return frameRect;
   return [super contentRectForFrameRect:frameRect];
 }
 
 @end