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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.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
« no previous file with comments | « chrome/browser/ui/cocoa/status_bubble_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 0c6614676dc11a1bc2147fdea57d15fa338fa94c..afa54de6efeb1adb274d4d1adee7dac60a3205b0 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -293,7 +293,7 @@ private:
// to let it know that |controller_| is ready to be removed from the model.
// Since we only maintain weak references, the tab strip must call -invalidate:
// to prevent the use of dangling pointers.
-@interface TabCloseAnimationDelegate : NSObject {
+@interface TabCloseAnimationDelegate : NSObject <CAAnimationDelegate> {
@private
TabStripController* strip_; // weak; owns us indirectly
TabController* controller_; // weak
@@ -309,7 +309,8 @@ private:
// prevent attempts to call into the released object.
- (void)invalidate;
-// CAAnimation delegate method
+// CAAnimation delegate methods
+- (void)animationDidStart:(CAAnimation*)animation;
- (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished;
@end
@@ -331,6 +332,9 @@ private:
controller_ = nil;
}
+- (void)animationDidStart:(CAAnimation*)theAnimation {
+ // CAAnimationDelegate method added on OSX 10.12.
+}
- (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished {
[strip_ animationDidStop:animation
forController:controller_
@@ -1406,7 +1410,7 @@ private:
- (void)animationDidStop:(CAAnimation*)animation
forController:(TabController*)controller
finished:(BOOL)finished{
- [[animation delegate] invalidate];
+ [(TabCloseAnimationDelegate *)[animation delegate] invalidate];
[closingControllers_ removeObject:controller];
[self removeTab:controller];
}
« no previous file with comments | « chrome/browser/ui/cocoa/status_bubble_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698