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

Unified Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.cc

Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this (Closed)
Patch Set: Incorporated review feedback Created 10 years, 8 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
« no previous file with comments | « chrome/browser/gtk/tabs/dragged_tab_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/tabs/tab_renderer_gtk.cc
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 20307d32fc76c81597cd7545640d9174916b5cc3..c8a0e6b34eed1faaedea32dc7d8427874eb20f57 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -200,11 +200,11 @@ void TabRendererGtk::LoadingAnimation::Observe(
// FaviconCrashAnimation
//
// A custom animation subclass to manage the favicon crash animation.
-class TabRendererGtk::FavIconCrashAnimation : public Animation,
+class TabRendererGtk::FavIconCrashAnimation : public LinearAnimation,
public AnimationDelegate {
public:
explicit FavIconCrashAnimation(TabRendererGtk* target)
- : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(1000, 25, this)),
+ : ALLOW_THIS_IN_INITIALIZER_LIST(LinearAnimation(1000, 25, this)),
target_(target) {
}
virtual ~FavIconCrashAnimation() {}
@@ -501,7 +501,7 @@ void TabRendererGtk::StartMiniTabTitleAnimation() {
mini_title_animation_->SetThrobDuration(kMiniTitleChangeThrobDuration);
}
- if (!mini_title_animation_->IsAnimating()) {
+ if (!mini_title_animation_->is_animating()) {
mini_title_animation_->StartThrobbing(2);
} else if (mini_title_animation_->cycles_remaining() <= 2) {
// The title changed while we're already animating. Add at most one more
@@ -575,7 +575,7 @@ void TabRendererGtk::StopCrashAnimation() {
}
bool TabRendererGtk::IsPerformingCrashAnimation() const {
- return crash_animation_.get() && crash_animation_->IsAnimating();
+ return crash_animation_.get() && crash_animation_->is_animating();
}
void TabRendererGtk::SetFavIconHidingOffset(int offset) {
@@ -986,7 +986,7 @@ CustomDrawButton* TabRendererGtk::MakeCloseButton() {
}
double TabRendererGtk::GetThrobValue() {
- if (mini_title_animation_.get() && mini_title_animation_->IsAnimating()) {
+ if (mini_title_animation_.get() && mini_title_animation_->is_animating()) {
return mini_title_animation_->GetCurrentValue() *
kMiniTitleChangeThrobOpacity;
}
@@ -1045,7 +1045,7 @@ void TabRendererGtk::OnSizeAllocate(GtkWidget* widget,
gboolean TabRendererGtk::OnEnterNotifyEvent(GtkWidget* widget,
GdkEventCrossing* event,
TabRendererGtk* tab) {
- tab->hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
+ tab->hover_animation_->SetTweenType(Tween::EASE_OUT);
tab->hover_animation_->Show();
return FALSE;
}
@@ -1054,7 +1054,7 @@ gboolean TabRendererGtk::OnEnterNotifyEvent(GtkWidget* widget,
gboolean TabRendererGtk::OnLeaveNotifyEvent(GtkWidget* widget,
GdkEventCrossing* event,
TabRendererGtk* tab) {
- tab->hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
+ tab->hover_animation_->SetTweenType(Tween::EASE_IN);
tab->hover_animation_->Hide();
return FALSE;
}
« no previous file with comments | « chrome/browser/gtk/tabs/dragged_tab_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698