diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 15:17:26 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 15:17:26 +0000 |
commit | 97a1fd4153f890a4ef18f877fd9542a9630aa620 (patch) | |
tree | 420ef3929a185afac767192b02bddb06d4fc65a9 /chrome/browser/cocoa/find_bar_cocoa_controller.h | |
parent | 7f1cb244394882a0ab0f11e67f22b87885d8ba20 (diff) | |
download | chromium_src-97a1fd4153f890a4ef18f877fd9542a9630aa620.zip chromium_src-97a1fd4153f890a4ef18f877fd9542a9630aa620.tar.gz chromium_src-97a1fd4153f890a4ef18f877fd9542a9630aa620.tar.bz2 |
[Mac] Adds animations to the findbar.
BUG=http://crbug.com/14908
TEST=Findbar should animate open and closed, unless switching tabs.
Review URL: http://codereview.chromium.org/195105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/find_bar_cocoa_controller.h')
-rw-r--r-- | chrome/browser/cocoa/find_bar_cocoa_controller.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller.h b/chrome/browser/cocoa/find_bar_cocoa_controller.h index 221f859..71ff248 100644 --- a/chrome/browser/cocoa/find_bar_cocoa_controller.h +++ b/chrome/browser/cocoa/find_bar_cocoa_controller.h @@ -22,6 +22,7 @@ class FindNotificationDetails; @interface FindBarCocoaController : NSViewController { @private + IBOutlet NSView* findBarView_; IBOutlet NSTextField* findText_; IBOutlet NSTextField* resultsLabel_; IBOutlet NSButton* nextButton_; @@ -31,6 +32,13 @@ class FindNotificationDetails; 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 @@ class FindNotificationDetails; - (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; |