Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2874)

Unified Diff: chrome/browser/ui/cocoa/framed_browser_window.mm

Issue 1276383004: Implemented fullscreen exit animation with AppKit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed extra include Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/framed_browser_window.h ('k') | chrome/browser/ui/cocoa/full_size_content_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5d098be8d3c00a47cd7a24ab4c2703c7ba498748..a83bc148bea819e70db4441d2d2903bccc92de7f 100644
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -45,6 +45,20 @@ const CGFloat kWindowGradientHeight = 24.0;
@implementation FramedBrowserWindow
+- (void)setStyleMask:(NSUInteger)styleMask {
+ if (frameAndStyleMaskLock_)
+ 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 |
@@ -97,6 +111,8 @@ const CGFloat kWindowGradientHeight = 24.0;
selector:@selector(adjustZoomButton:)
name:NSViewFrameDidChangeNotification
object:zoomButton_];
+
+ frameAndStyleMaskLock_ = NO;
}
return self;
@@ -177,6 +193,10 @@ const CGFloat kWindowGradientHeight = 24.0;
shouldHideTitle_ = flag;
}
+- (void)setFrameAndStyleMaskLock:(BOOL)lock {
+ frameAndStyleMaskLock_ = lock;
+}
+
- (BOOL)_isTitleHidden {
return shouldHideTitle_;
}
« no previous file with comments | « chrome/browser/ui/cocoa/framed_browser_window.h ('k') | chrome/browser/ui/cocoa/full_size_content_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698