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

Unified Diff: chrome/browser/ui/cocoa/info_bubble_window.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/confirm_quit_panel_controller.mm ('k') | chrome/browser/ui/cocoa/spinner_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/info_bubble_window.mm
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm
index f42a1491a32b76d854df68bb86ae8460b76c801f..97cc9b419e8eb20a93db9ab327043c28a3a2bc58 100644
--- a/chrome/browser/ui/cocoa/info_bubble_window.mm
+++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
@@ -9,6 +9,7 @@
#include "base/logging.h"
#import "base/mac/foundation_util.h"
#import "base/mac/scoped_nsobject.h"
+#import "base/mac/sdk_forward_declarations.h"
#include "base/macros.h"
#include "chrome/browser/chrome_notification_types.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
@@ -68,7 +69,7 @@ class AppNotificationBridge : public content::NotificationObserver {
// An InfoBubbleWindow instance cannot be the delegate for its own animation
// because CAAnimations retain their delegates, and since the InfoBubbleWindow
// retains its animations a retain loop would be formed.
-@interface InfoBubbleWindowCloser : NSObject {
+@interface InfoBubbleWindowCloser : NSObject <CAAnimationDelegate> {
@private
InfoBubbleWindow* window_; // Weak. Window to close.
}
@@ -84,6 +85,10 @@ class AppNotificationBridge : public content::NotificationObserver {
return self;
}
+- (void)animationDidStart:(CAAnimation*)theAnimation {
+ // CAAnimationDelegate method added on OSX 10.12.
+}
+
// Callback for the alpha animation. Closes window_ if appropriate.
- (void)animationDidStop:(CAAnimation*)anim finished:(BOOL)flag {
// When alpha reaches zero, close window_.
« no previous file with comments | « chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm ('k') | chrome/browser/ui/cocoa/spinner_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698