diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 17:33:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 17:33:39 +0000 |
| commit | f676780687464428e340d008a0d1ca13d9944628 (patch) | |
| tree | 489e8bd8188e31a7f6c53f15e8d1d9c6ba36d023 /chrome/browser/ui/views/info_bubble.cc | |
| parent | 3b65bfd55c56cf8a6db025087d937494f49dc15f (diff) | |
| download | chromium_src-f676780687464428e340d008a0d1ca13d9944628.zip chromium_src-f676780687464428e340d008a0d1ca13d9944628.tar.gz chromium_src-f676780687464428e340d008a0d1ca13d9944628.tar.bz2 | |
Move animation code to new ui/base/animation directory.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6154001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/info_bubble.cc')
| -rw-r--r-- | chrome/browser/ui/views/info_bubble.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc index cc9e574..8d07a57 100644 --- a/chrome/browser/ui/views/info_bubble.cc +++ b/chrome/browser/ui/views/info_bubble.cc @@ -7,13 +7,13 @@ #include <vector> #include "app/keyboard_codes.h" -#include "app/slide_animation.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/path.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/animation/slide_animation.h" #include "views/fill_layout.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" @@ -282,7 +282,7 @@ void InfoBubble::Close() { DoClose(false); } -void InfoBubble::AnimationEnded(const Animation* animation) { +void InfoBubble::AnimationEnded(const ui::Animation* animation) { if (static_cast<int>(animation_->GetCurrentValue()) == 0) { // When fading out we just need to close the bubble at the end DoClose(false); @@ -295,7 +295,7 @@ void InfoBubble::AnimationEnded(const Animation* animation) { } } -void InfoBubble::AnimationProgressed(const Animation* animation) { +void InfoBubble::AnimationProgressed(const ui::Animation* animation) { #if defined(OS_WIN) // Set the opacity for the main contents window. unsigned char opacity = static_cast<unsigned char>( @@ -545,9 +545,9 @@ void InfoBubble::FadeOut() { } void InfoBubble::Fade(bool fade_in) { - animation_.reset(new SlideAnimation(this)); + animation_.reset(new ui::SlideAnimation(this)); animation_->SetSlideDuration(kHideFadeDurationMS); - animation_->SetTweenType(Tween::LINEAR); + animation_->SetTweenType(ui::Tween::LINEAR); animation_->Reset(fade_in ? 0.0 : 1.0); if (fade_in) |