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

Unified Diff: chrome/browser/ui/views/infobars/translate_infobar_base.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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
Index: chrome/browser/ui/views/infobars/translate_infobar_base.cc
diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc
index 03a8738ece9995082df3f2e44dfe8e23afe11439..896ac972a09ec2d115118a52e5e45e58ebb641f8 100644
--- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc
+++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc
@@ -10,8 +10,8 @@
#include "chrome/browser/ui/views/infobars/before_translate_infobar.h"
#include "chrome/browser/ui/views/infobars/translate_message_infobar.h"
#include "grit/theme_resources.h"
-#include "ui/base/animation/slide_animation.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/label.h"
@@ -55,8 +55,8 @@ void TranslateInfoBarBase::ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) {
if (details.is_add && (details.child == this) &&
(background_color_animation_ == NULL)) {
- background_color_animation_.reset(new ui::SlideAnimation(this));
- background_color_animation_->SetTweenType(ui::Tween::LINEAR);
+ background_color_animation_.reset(new gfx::SlideAnimation(this));
+ background_color_animation_->SetTweenType(gfx::Tween::LINEAR);
background_color_animation_->SetSlideDuration(500);
TranslateInfoBarDelegate::BackgroundAnimationType animation =
GetDelegate()->background_animation_type();
@@ -97,7 +97,8 @@ void TranslateInfoBarBase::OnPaintBackground(gfx::Canvas* canvas) {
error_background_);
}
-void TranslateInfoBarBase::AnimationProgressed(const ui::Animation* animation) {
+void TranslateInfoBarBase::AnimationProgressed(
+ const gfx::Animation* animation) {
if (animation == background_color_animation_.get())
SchedulePaint(); // That'll trigger a PaintBackgroud.
else

Powered by Google App Engine
This is Rietveld 408576698