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

ui/message_center/views/message_center_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/message_center_view.h"
 
 #include <list>
 #include <map>
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "grit/ui_strings.h"
-#include "ui/base/animation/multi_animation.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/animation/multi_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/views/message_center_button_bar.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/message_center/views/notification_view.h"
@@ skipping 382 matching lines @@
     clearing_all_views_.push_back(child);
   }
   DoUpdateIfPossible();
 }
 
 void MessageListView::OnBoundsAnimatorProgressed(
     views::BoundsAnimator* animator) {
   DCHECK_EQ(animator_.get(), animator);
   for (std::set<views::View*>::iterator iter = deleted_when_done_.begin();
        iter != deleted_when_done_.end(); ++iter) {
-    const ui::SlideAnimation* animation = animator->GetAnimationForView(*iter);
+    const gfx::SlideAnimation* animation = animator->GetAnimationForView(*iter);
     if (animation)
       (*iter)->layer()->SetOpacity(animation->CurrentValueBetween(1.0, 0.0));
   }
 }
 
 void MessageListView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
   STLDeleteContainerPointers(
       deleted_when_done_.begin(), deleted_when_done_.end());
   deleted_when_done_.clear();
 
@@ skipping 247 matching lines @@
   if (visible) {
     source_view_ = scroller_;
     target_view_ = settings_view_;
   } else {
     source_view_ = settings_view_;
     target_view_ = scroller_;
   }
   source_height_ = source_view_->GetHeightForWidth(width());
   target_height_ = target_view_->GetHeightForWidth(width());
 
-  ui::MultiAnimation::Parts parts;
+  gfx::MultiAnimation::Parts parts;
   // First part: slide resize animation.
-  parts.push_back(ui::MultiAnimation::Part(
+  parts.push_back(gfx::MultiAnimation::Part(
       (source_height_ == target_height_) ? 0 : kDefaultAnimationDurationMs,
-      ui::Tween::EASE_OUT));
+      gfx::Tween::EASE_OUT));
   // Second part: fade-out the source_view.
   if (source_view_->layer()) {
-    parts.push_back(ui::MultiAnimation::Part(
-        kDefaultAnimationDurationMs, ui::Tween::LINEAR));
+    parts.push_back(gfx::MultiAnimation::Part(
+        kDefaultAnimationDurationMs, gfx::Tween::LINEAR));
   } else {
-    parts.push_back(ui::MultiAnimation::Part());
+    parts.push_back(gfx::MultiAnimation::Part());
   }
   // Third part: fade-in the target_view.
   if (target_view_->layer()) {
-    parts.push_back(ui::MultiAnimation::Part(
-        kDefaultAnimationDurationMs, ui::Tween::LINEAR));
+    parts.push_back(gfx::MultiAnimation::Part(
+        kDefaultAnimationDurationMs, gfx::Tween::LINEAR));
     target_view_->layer()->SetOpacity(0);
     target_view_->SetVisible(true);
   } else {
-    parts.push_back(ui::MultiAnimation::Part());
+    parts.push_back(gfx::MultiAnimation::Part());
   }
-  settings_transition_animation_.reset(new ui::MultiAnimation(
+  settings_transition_animation_.reset(new gfx::MultiAnimation(
       parts, base::TimeDelta::FromMicroseconds(1000000 / kDefaultFrameRateHz)));
   settings_transition_animation_->set_delegate(this);
   settings_transition_animation_->set_continuous(false);
   settings_transition_animation_->Start();
 
   button_bar_->SetBackArrowVisible(visible);
 }
 
 void MessageCenterView::ClearAllNotifications() {
   if (is_closing_)
@@ skipping 206 matching lines @@
                                            // notification.
       view->set_scroller(scroller_);
       message_list_view_->UpdateNotificationAt(view, index);
       message_views_[index] = view;
       NotificationsChanged();
       break;
     }
   }
 }
 
-void MessageCenterView::AnimationEnded(const ui::Animation* animation) {
+void MessageCenterView::AnimationEnded(const gfx::Animation* animation) {
   DCHECK_EQ(animation, settings_transition_animation_.get());
 
   Visibility visibility = target_view_ == settings_view_
                               ? VISIBILITY_SETTINGS
                               : VISIBILITY_MESSAGE_CENTER;
   message_center_->SetVisibility(visibility);
 
   source_view_->SetVisible(false);
   target_view_->SetVisible(true);
   if (source_view_->layer())
     source_view_->layer()->SetOpacity(1.0);
   if (target_view_->layer())
     target_view_->layer()->SetOpacity(1.0);
   settings_transition_animation_.reset();
   PreferredSizeChanged();
   Layout();
 }
 
-void MessageCenterView::AnimationProgressed(const ui::Animation* animation) {
+void MessageCenterView::AnimationProgressed(const gfx::Animation* animation) {
   DCHECK_EQ(animation, settings_transition_animation_.get());
   PreferredSizeChanged();
   if (settings_transition_animation_->current_part_index() == 1 &&
       source_view_->layer()) {
     source_view_->layer()->SetOpacity(
         1.0 - settings_transition_animation_->GetCurrentValue());
     SchedulePaint();
   } else if (settings_transition_animation_->current_part_index() == 2 &&
              target_view_->layer()) {
     target_view_->layer()->SetOpacity(
         settings_transition_animation_->GetCurrentValue());
     SchedulePaint();
   }
 }
 
-void MessageCenterView::AnimationCanceled(const ui::Animation* animation) {
+void MessageCenterView::AnimationCanceled(const gfx::Animation* animation) {
   DCHECK_EQ(animation, settings_transition_animation_.get());
   AnimationEnded(animation);
 }
 
 void MessageCenterView::AddNotificationAt(const Notification& notification,
                                           int index) {
   // NotificationViews are expanded by default here until
   // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix.
   MessageView* view =
       NotificationView::Create(notification,
@@ skipping 18 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center