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

ui/message_center/views/toast_contents_view.cc

 // Copyright (c) 2013 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 "ui/message_center/views/toast_contents_view.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 26 matching lines @@
       is_closing_(false),
       closing_animation_(NULL) {
   DCHECK(collection_);
 
   set_notify_enter_exit_on_child(true);
   // Sets the transparent background. Then, when the message view is slid out,
   // the whole toast seems to slide although the actual bound of the widget
   // remains. This is hacky but easier to keep the consistency.
   set_background(views::Background::CreateSolidBackground(0, 0, 0, 0));
 
-  fade_animation_.reset(new ui::SlideAnimation(this));
+  fade_animation_.reset(new gfx::SlideAnimation(this));
   fade_animation_->SetSlideDuration(kFadeInOutDuration);
 }
 
 // This is destroyed when the toast window closes.
 ToastContentsView::~ToastContentsView() {
 }
 
 views::Widget* ToastContentsView::CreateWidget(gfx::NativeView parent) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_POPUP);
@@ skipping 87 matching lines @@
   // on screen, the rest should refer to the bounds_.
   animated_bounds_start_ = GetWidget()->GetWindowBoundsInScreen();
   animated_bounds_end_ = new_bounds;
 
   if (collection_)
     collection_->IncrementDeferCounter();
 
   if (bounds_animation_.get())
     bounds_animation_->Stop();
 
-  bounds_animation_.reset(new ui::SlideAnimation(this));
+  bounds_animation_.reset(new gfx::SlideAnimation(this));
   bounds_animation_->Show();
 }
 
 void ToastContentsView::StartFadeIn() {
   // The decrement is done in OnBoundsAnimationEndedOrCancelled callback.
   if (collection_)
     collection_->IncrementDeferCounter();
   fade_animation_->Stop();
 
   GetWidget()->SetOpacity(0);
   GetWidget()->Show();
   fade_animation_->Reset(0);
   fade_animation_->Show();
 }
 
 void ToastContentsView::StartFadeOut() {
   // The decrement is done in OnBoundsAnimationEndedOrCancelled callback.
   if (collection_)
     collection_->IncrementDeferCounter();
   fade_animation_->Stop();
 
   closing_animation_ = (is_closing_ ? fade_animation_.get() : NULL);
   fade_animation_->Reset(1);
   fade_animation_->Hide();
 }
 
 void ToastContentsView::OnBoundsAnimationEndedOrCancelled(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (is_closing_ && closing_animation_ == animation && GetWidget()) {
     views::Widget* widget = GetWidget();
 #if defined(USE_AURA)
     // TODO(dewittj): This is a workaround to prevent a nasty bug where
     // closing a transparent widget doesn't actually remove the window,
     // causing entire areas of the screen to become unresponsive to clicks.
     // See crbug.com/243469
     widget->Hide();
 # if defined(OS_WIN)
     widget->SetOpacity(0xFF);
 # endif
 #endif
     widget->Close();
   }
 
   // This cannot be called before GetWidget()->Close(). Decrementing defer count
   // will invoke update, which may invoke another close animation with
   // incrementing defer counter. Close() after such process will cause a
   // mismatch between increment/decrement. See crbug.com/238477
   if (collection_)
     collection_->DecrementDeferCounter();
 }
 
-// ui::AnimationDelegate
-void ToastContentsView::AnimationProgressed(const ui::Animation* animation) {
+// gfx::AnimationDelegate
+void ToastContentsView::AnimationProgressed(const gfx::Animation* animation) {
   if (animation == bounds_animation_.get()) {
     gfx::Rect current(animation->CurrentValueBetween(
         animated_bounds_start_, animated_bounds_end_));
     GetWidget()->SetBounds(current);
   } else if (animation == fade_animation_.get()) {
     unsigned char opacity =
         static_cast<unsigned char>(fade_animation_->GetCurrentValue() * 255);
     GetWidget()->SetOpacity(opacity);
   }
 }
 
-void ToastContentsView::AnimationEnded(const ui::Animation* animation) {
+void ToastContentsView::AnimationEnded(const gfx::Animation* animation) {
   OnBoundsAnimationEndedOrCancelled(animation);
 }
 
 void ToastContentsView::AnimationCanceled(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   OnBoundsAnimationEndedOrCancelled(animation);
 }
 
 // views::WidgetDelegate
 views::View* ToastContentsView::GetContentsView() {
   return this;
 }
 
 void ToastContentsView::WindowClosing() {
   if (!is_closing_ && collection_)
@@ skipping 63 matching lines @@
 }
 
 gfx::Rect ToastContentsView::GetClosedToastBounds(gfx::Rect bounds) {
   return gfx::Rect(bounds.x() + bounds.width() - kClosedToastWidth,
                    bounds.y(),
                    kClosedToastWidth,
                    bounds.height());
 }
 
 }  // namespace message_center