diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 03:43:55 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 03:43:55 +0000 |
| commit | 4ce7e15da651c6221720e33dc8c500830d4b6b8a (patch) | |
| tree | 376ef1d7e7951dae3376e65f4edee9e7367adc89 /chrome/browser/gtk/slide_animator_gtk.cc | |
| parent | 5ee3ca64cdf2d00f82a1bc36f36e8ab5e520b4de (diff) | |
| download | chromium_src-4ce7e15da651c6221720e33dc8c500830d4b6b8a.zip chromium_src-4ce7e15da651c6221720e33dc8c500830d4b6b8a.tar.gz chromium_src-4ce7e15da651c6221720e33dc8c500830d4b6b8a.tar.bz2 | |
Refactors animation to allow for cleaner subclassing. I'm doing this
for creating a different animation subclass (which you'll see
shortly).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1961001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/slide_animator_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/slide_animator_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/slide_animator_gtk.cc b/chrome/browser/gtk/slide_animator_gtk.cc index 2c1549d..ff20c40 100644 --- a/chrome/browser/gtk/slide_animator_gtk.cc +++ b/chrome/browser/gtk/slide_animator_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -60,7 +60,7 @@ SlideAnimatorGtk::SlideAnimatorGtk(GtkWidget* child, animation_.reset(new SlideAnimation(this)); // Default tween type is EASE_OUT. if (linear) - animation_->SetTweenType(SlideAnimation::NONE); + animation_->SetTweenType(Tween::LINEAR); if (duration != 0) animation_->SetSlideDuration(duration); } @@ -111,7 +111,7 @@ bool SlideAnimatorGtk::IsClosing() { } bool SlideAnimatorGtk::IsAnimating() { - return animation_->IsAnimating(); + return animation_->is_animating(); } void SlideAnimatorGtk::AnimationProgressed(const Animation* animation) { |