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

Unified Diff: chrome/browser/ui/cocoa/info_bubble_window.h

Issue 952793002: Mac: Make ui/base/cocoa WindowAnimator Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git add Created 5 years, 10 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/base_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/info_bubble_window.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.h
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.h b/chrome/browser/ui/cocoa/info_bubble_window.h
index 182e3c93d87d9ca2d30addb474f27f4c67c5dc8f..6e23d455ced9b30a76a450111282bb7bbea1dd5e 100644
--- a/chrome/browser/ui/cocoa/info_bubble_window.h
+++ b/chrome/browser/ui/cocoa/info_bubble_window.h
@@ -4,10 +4,12 @@
#import <Cocoa/Cocoa.h>
+#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
class AppNotificationBridge;
+@class WindowAnimationController;
namespace info_bubble {
@@ -24,9 +26,6 @@ typedef NSUInteger AllowedAnimations;
// button or that pops up within our first-run UI.
@interface InfoBubbleWindow : ChromeEventProcessingWindow {
@private
- // Is self in the process of closing.
- BOOL closing_;
-
// Specifies if window order in and order out animations are allowed. By
// default both types of animations are allowed.
info_bubble::AllowedAnimations allowedAnimations_;
@@ -42,12 +41,19 @@ typedef NSUInteger AllowedAnimations;
// Bridge to proxy Chrome notifications to the window.
scoped_ptr<AppNotificationBridge> notificationBridge_;
+
+ // Controller for closing the window (note: creates a reference cycle during
+ // the close animation).
+ base::scoped_nsobject<WindowAnimationController> animation_controller_;
}
@property(nonatomic) info_bubble::AllowedAnimations allowedAnimations;
@property(nonatomic) BOOL canBecomeKeyWindow;
@property(nonatomic) BOOL allowShareParentKeyState;
+// Start the animation to hide the window, then close it.
+- (void)animateClose;
+
// Returns YES if the window is in the process of closing.
// Can't use "windowWillClose" notification because that will be sent
// after the closing animation has completed.
« no previous file with comments | « chrome/browser/ui/cocoa/base_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/info_bubble_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698