diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 22:50:13 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 22:50:13 +0000 |
| commit | e8c45c7a2f1c130337578f562da0c1116916e987 (patch) | |
| tree | c46bb16a75efd6f5f7ea7020374bdefc49512bd3 /chrome/browser/cocoa | |
| parent | 07016f33920449257d570542804325b5f74a8e31 (diff) | |
| download | chromium_src-e8c45c7a2f1c130337578f562da0c1116916e987.zip chromium_src-e8c45c7a2f1c130337578f562da0c1116916e987.tar.gz chromium_src-e8c45c7a2f1c130337578f562da0c1116916e987.tar.bz2 | |
Merge r32541 from trunk to 249 branch.
[Mac] Rename a poorly named class.
BUG=http://crbug.com/28261
TEST=None
Review URL: http://codereview.chromium.org/402088
TBR=rohitrao@chromium.org
Review URL: http://codereview.chromium.org/402102
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/animatable_view.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/animatable_view.mm b/chrome/browser/cocoa/animatable_view.mm index bf5da1d..0ca0f2e 100644 --- a/chrome/browser/cocoa/animatable_view.mm +++ b/chrome/browser/cocoa/animatable_view.mm @@ -10,7 +10,7 @@ // NSAnimation subclass that animates the height of an AnimatableView. Allows // the caller to start and cancel the animation as desired. -@interface NSHeightAnimation : NSAnimation { +@interface HeightAnimation : NSAnimation { @private AnimatableView* view_; // weak, owns us. CGFloat startHeight_; @@ -24,7 +24,7 @@ duration:(NSTimeInterval)duration; @end -@implementation NSHeightAnimation +@implementation HeightAnimation - (id)initWithView:(AnimatableView*)view finalHeight:(CGFloat)height duration:(NSTimeInterval)duration { @@ -73,9 +73,9 @@ duration:(NSTimeInterval)duration { [currentAnimation_ stopAnimation]; - currentAnimation_.reset([[NSHeightAnimation alloc] initWithView:self - finalHeight:newHeight - duration:duration]); + currentAnimation_.reset([[HeightAnimation alloc] initWithView:self + finalHeight:newHeight + duration:duration]); if ([resizeDelegate_ respondsToSelector:@selector(setAnimationInProgress:)]) [resizeDelegate_ setAnimationInProgress:YES]; [currentAnimation_ startAnimation]; |