ui/base/animation -> ui/gfx/animation

chrome/browser/infobars/infobar.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/infobars/infobar.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
 
 SkColor GetInfoBarTopColor(InfoBarDelegate::Type infobar_type) {
   static const SkColor kWarningBackgroundColorTop =
       SkColorSetRGB(255, 242, 183);  // Yellow
   static const SkColor kPageActionBackgroundColorTop =
       SkColorSetRGB(237, 237, 237);  // Gray
   return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
       kWarningBackgroundColorTop : kPageActionBackgroundColorTop;
 }
 
@@ skipping 11 matching lines @@
       delegate_(delegate),
       container_(NULL),
       animation_(this),
       arrow_height_(0),
       arrow_target_height_(kDefaultArrowTargetHeight),
       arrow_half_width_(0),
       bar_height_(0),
       bar_target_height_(kDefaultBarTargetHeight) {
   DCHECK(owner_ != NULL);
   DCHECK(delegate_ != NULL);
-  animation_.SetTweenType(ui::Tween::LINEAR);
+  animation_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 InfoBar::~InfoBar() {
 }
 
 void InfoBar::Show(bool animate) {
   PlatformSpecificShow(animate);
   if (animate) {
     animation_.Show();
   } else {
@@ skipping 25 matching lines @@
     RecalculateHeights(false);
   }
 }
 
 void InfoBar::CloseSoon() {
   owner_ = NULL;
   PlatformSpecificOnCloseSoon();
   MaybeDelete();
 }
 
-void InfoBar::AnimationProgressed(const ui::Animation* animation) {
+void InfoBar::AnimationProgressed(const gfx::Animation* animation) {
   RecalculateHeights(false);
 }
 
 void InfoBar::RemoveSelf() {
   // |owner_| should never be NULL here.  If it is, then someone violated what
   // they were supposed to do -- e.g. a ConfirmInfoBarDelegate subclass returned
   // true from Accept() or Cancel() even though the infobar was already closing.
   // In the worst case, if we also switched tabs during that process, then
   // |this| has already been destroyed.  But if that's the case, then we're
   // going to deref a garbage |this| pointer here whether we check |owner_| or
   // not, and in other cases (where we're still closing and |this| is valid),
   // checking |owner_| here will avoid a NULL deref.
   if (owner_)
     owner_->RemoveInfoBar(delegate_);
 }
 
 void InfoBar::SetBarTargetHeight(int height) {
   if (bar_target_height_ != height) {
     bar_target_height_ = height;
     RecalculateHeights(false);
   }
 }
 
 int InfoBar::OffsetY(const gfx::Size& prefsize) const {
   return arrow_height_ +
       std::max((bar_target_height_ - prefsize.height()) / 2, 0) -
       (bar_target_height_ - bar_height_);
 }
 
-void InfoBar::AnimationEnded(const ui::Animation* animation) {
+void InfoBar::AnimationEnded(const gfx::Animation* animation) {
   // When the animation ends, we must ensure the container is notified even if
   // the heights haven't changed, lest it never get an "animation finished"
   // notification.  (If the browser doesn't get this notification, it will not
   // bother to re-layout the content area for the new infobar size.)
   RecalculateHeights(true);
   MaybeDelete();
 }
 
 void InfoBar::RecalculateHeights(bool force_notify) {
   int old_arrow_height = arrow_height_;
@@ skipping 39 matching lines @@
 }
 
 void InfoBar::MaybeDelete() {
   if (!owner_ && delegate_ && (animation_.GetCurrentValue() == 0.0)) {
     if (container_)
       container_->RemoveInfoBar(this);
     delete delegate_;
     delegate_ = NULL;
   }
 }