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

Unified Diff: chrome/browser/cocoa/find_bar_cocoa_controller.h

Issue 195105: [Mac] Adds animations to the findbar.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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/cocoa/find_bar_cocoa_controller.h
===================================================================
--- chrome/browser/cocoa/find_bar_cocoa_controller.h (revision 26362)
+++ chrome/browser/cocoa/find_bar_cocoa_controller.h (working copy)
@@ -22,6 +22,7 @@
@interface FindBarCocoaController : NSViewController {
@private
+ IBOutlet NSView* findBarView_;
IBOutlet NSTextField* findText_;
IBOutlet NSTextField* resultsLabel_;
IBOutlet NSButton* nextButton_;
@@ -31,6 +32,13 @@
FindBarBridge* findBarBridge_; // weak
scoped_nsobject<FocusTracker> focusTracker_;
+
+ // The currently-running animation. This is defined to be non-nil if an
+ // animation is running, and is always nil otherwise. The
+ // FindBarCocoaController should not be deallocated while an animation is
+ // running (stopAnimation is currently called before the last tab in a
+ // window is removed).
+ scoped_nsobject<NSViewAnimation> currentAnimation_;
};
// Initializes a new FindBarCocoaController.
@@ -49,8 +57,9 @@
- (void)positionFindBarView:(NSView*)infoBarContainerView;
// Methods called from FindBarBridge.
-- (void)showFindBar;
-- (void)hideFindBar;
+- (void)showFindBar:(BOOL)animate;
+- (void)hideFindBar:(BOOL)animate;
+- (void)stopAnimation;
- (void)setFocusAndSelection;
- (void)restoreSavedFocus;
- (void)setFindText:(const string16&)findText;

Powered by Google App Engine
This is Rietveld 408576698