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

Unified Diff: chrome/browser/views/tabs/side_tab.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/views/tabs/dragged_tab_view.cc ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/tabs/side_tab.cc
diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
index dfa18e1e1c36005d5f793881d39aefed759dd774..54795fb0ff833c712fe22166cadcf4c6c8c64a6e 100644
--- a/chrome/browser/views/tabs/side_tab.cc
+++ b/chrome/browser/views/tabs/side_tab.cc
@@ -165,7 +165,7 @@ void SideTab::Paint(gfx::Canvas* canvas) {
SkPaint paint;
SkAlpha opacity = kBackgroundTabAlpha;
- if (hover_animation_->IsAnimating())
+ if (hover_animation_->is_animating())
opacity = static_cast<SkAlpha>(hover_animation_->GetCurrentValue() * 255);
paint.setColor(SkColorSetARGB(kBackgroundTabAlpha, 255, 255, 255));
@@ -181,12 +181,12 @@ gfx::Size SideTab::GetPreferredSize() {
}
void SideTab::OnMouseEntered(const views::MouseEvent& event) {
- hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
+ hover_animation_->SetTweenType(Tween::EASE_OUT);
hover_animation_->Show();
}
void SideTab::OnMouseExited(const views::MouseEvent& event) {
- hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
+ hover_animation_->SetTweenType(Tween::EASE_IN);
hover_animation_->Hide();
}
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_view.cc ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698