| 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..0c0b4861588f75ed294080b917e7530eb18c43af 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 |
|
| @@ -111,8 +103,6 @@ const CGFloat kWindowGradientHeight = 24.0;
|
| selector:@selector(adjustZoomButton:)
|
| name:NSViewFrameDidChangeNotification
|
| object:zoomButton_];
|
| -
|
| - frameAndStyleMaskLock_ = NO;
|
| }
|
|
|
| return self;
|
| @@ -193,8 +183,8 @@ const CGFloat kWindowGradientHeight = 24.0;
|
| shouldHideTitle_ = flag;
|
| }
|
|
|
| -- (void)setFrameAndStyleMaskLock:(BOOL)lock {
|
| - frameAndStyleMaskLock_ = lock;
|
| +- (void)setStyleMaskLock:(BOOL)lock {
|
| + styleMaskLock_ = lock;
|
| }
|
|
|
| - (BOOL)_isTitleHidden {
|
|
|