Fix for Exit Fullscreen Animation

chrome/browser/ui/cocoa/framed_browser_window.mm

Index: chrome/browser/ui/cocoa/framed_browser_window.mm
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm
index a83bc148bea819e70db4441d2d2903bccc92de7f..e8803efe5a28e755e72e9ba35cc05b17f9e3e9e1 100644
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -46,19 +46,11 @@ const CGFloat kWindowGradientHeight = 24.0;
 @implementation FramedBrowserWindow
 
 - (void)setStyleMask:(NSUInteger)styleMask {
-  if (frameAndStyleMaskLock_)
+  if (styleMaskLock_)
     return;
   [super setStyleMask:styleMask];
 }
 
-- (void)setFrame:(NSRect)windowFrame
-         display:(BOOL)displayViews
-         animate:(BOOL)performAnimation {
-  if (frameAndStyleMaskLock_)
-    return;
-  [super setFrame:windowFrame display:displayViews animate:performAnimation];
-}
-
 - (id)initWithContentRect:(NSRect)contentRect
               hasTabStrip:(BOOL)hasTabStrip{
   NSUInteger styleMask = NSTitledWindowMask |
@@ -112,7 +104,7 @@ const CGFloat kWindowGradientHeight = 24.0;
                    name:NSViewFrameDidChangeNotification
                  object:zoomButton_];
 
-    frameAndStyleMaskLock_ = NO;
+    styleMaskLock_ = NO;

[erikchen, 2015/11/09 18:29:21]

unnecessary.

[spqchan, 2015/11/09 22:27:19]

Done.

   }
 
   return self;
@@ -193,8 +185,8 @@ const CGFloat kWindowGradientHeight = 24.0;
   shouldHideTitle_ = flag;
 }
 
-- (void)setFrameAndStyleMaskLock:(BOOL)lock {
-  frameAndStyleMaskLock_ = lock;
+- (void)setStyleMaskLock:(BOOL)lock {
+  styleMaskLock_ = lock;
 }
 
 - (BOOL)_isTitleHidden {