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

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.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/sprite_view.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/status_bubble_mac.mm
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm
index 00cd3260804b77cec32bf52a88f734b369163c69..62edf8f4ef9534f1dc7c817e3a173f9dee719573 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -64,14 +64,15 @@ const CGFloat kExpansionDurationSeconds = 0.125;
} // namespace
-@interface StatusBubbleAnimationDelegate : NSObject {
+@interface StatusBubbleAnimationDelegate : NSObject <CAAnimationDelegate> {
@private
base::mac::ScopedBlock<void (^)(void)> completionHandler_;
}
- (id)initWithCompletionHandler:(void (^)(void))completionHandler;
-// CAAnimation delegate method
+// CAAnimation delegate methods
+- (void)animationDidStart:(CAAnimation*)animation;
- (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished;
@end
@@ -85,6 +86,9 @@ const CGFloat kExpansionDurationSeconds = 0.125;
return self;
}
+- (void)animationDidStart:(CAAnimation*)theAnimation {
+ // CAAnimationDelegate method added on OSX 10.12.
+}
- (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished {
completionHandler_.get()();
}
« no previous file with comments | « chrome/browser/ui/cocoa/sprite_view.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698