Fix for Exit Fullscreen Animation

chrome/browser/ui/cocoa/framed_browser_window.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/framed_browser_window.h"
 
 #include "base/logging.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 28 matching lines @@
 - (void)adjustMiniaturizeButton:(NSNotification*)notification;
 - (void)adjustZoomButton:(NSNotification*)notification;
 - (void)adjustButton:(NSButton*)button
               ofKind:(NSWindowButton)kind;
 
 @end
 
 @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 |
                          NSClosableWindowMask |
                          NSMiniaturizableWindowMask |
                          NSResizableWindowMask |
                          NSTexturedBackgroundWindowMask;
   if ((self = [super initWithContentRect:contentRect
                                styleMask:styleMask
                                  backing:NSBackingStoreBuffered
@@ skipping 33 matching lines @@
                  object:closeButton_];
     [center addObserver:self
                selector:@selector(adjustMiniaturizeButton:)
                    name:NSViewFrameDidChangeNotification
                  object:miniaturizeButton_];
     [center addObserver:self
                selector:@selector(adjustZoomButton:)
                    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;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
@@ skipping 60 matching lines @@
   if (!value) {
     value = [super accessibilityHitTest:point];
   }
   return value;
 }
 
 - (void)setShouldHideTitle:(BOOL)flag {
   shouldHideTitle_ = flag;
 }
 
-- (void)setFrameAndStyleMaskLock:(BOOL)lock {
-  frameAndStyleMaskLock_ = lock;
+- (void)setStyleMaskLock:(BOOL)lock {
+  styleMaskLock_ = lock;
 }
 
 - (BOOL)_isTitleHidden {
   return shouldHideTitle_;
 }
 
 - (CGFloat)windowButtonsInterButtonSpacing {
   return windowButtonsInterButtonSpacing_;
 }
 
@@ skipping 150 matching lines @@
   ThemedWindowStyle windowStyle = [self themedWindowStyle];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
 @end