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

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

Issue 2257553002: Fix OSX 10.12 compilation errors in chrome/browser/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved 10.12 SDK defines to one header. Created 4 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
Index: chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm b/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm
index 5b6542a32d435c67991745a8a982d46bf8f70ccc..df3968b4e6901147c7d9792297b5b4196d634a5c 100644
--- a/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm
+++ b/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm
@@ -88,7 +88,8 @@ class FrameAndStyleLock {
@end
-@interface BrowserWindowFullscreenTransition () {
+@interface BrowserWindowFullscreenTransition ()
+ <CAAnimationDelegate, CALayerDelegate> {
// Flag to keep track of whether we are entering or exiting fullscreen.
BOOL isEnteringFullscreen_;
@@ -164,7 +165,8 @@ class FrameAndStyleLock {
// Sets |primaryWindow_|'s frame to the expected frame.
- (void)changePrimaryWindowToFinalFrame;
-// Override of CAAnimation delegate method.
+// Overrides of CAAnimation delegate methods.
+- (void)animationDidStart:(CAAnimation*)theAnimation;
- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished;
// Returns the layer of the root view of |window|.
@@ -482,6 +484,10 @@ class FrameAndStyleLock {
changingPrimaryWindowSize_ = NO;
}
+- (void)animationDidStart:(CAAnimation*)theAnimation {
+ // CAAnimationDelegate method added on OSX 10.12.
+}
+
- (void)animationDidStop:(CAAnimation*)theAnimation finished:(BOOL)finished {
NSString* animationID = [theAnimation valueForKey:kAnimationIDKey];
« no previous file with comments | « chrome/browser/ui/cocoa/animatable_image.mm ('k') | chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698