Move animation code to new ui/base/animation directory....

chrome/browser/ui/views/frame/contents_container.cc

 // Copyright (c) 2010 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/views/frame/contents_container.h"
 
-#include "app/slide_animation.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/animation/slide_animation.h"
 #include "views/background.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 // Min/max opacity of the overlay.
 static const int kMinOpacity = 0;
 static const int kMaxOpacity = 192;
 
 // View used to track when the overlay widget is destroyed. If the
 // ContentsContainer is still valid when the destructor is invoked this invokes
@@ skipping 68 matching lines @@
   InvalidateLayout();
 }
 
 gfx::Rect ContentsContainer::GetPreviewBounds() {
   gfx::Point screen_loc;
   ConvertPointToScreen(this, &screen_loc);
   return gfx::Rect(screen_loc, size());
 }
 
 void ContentsContainer::FadeActiveContents() {
-  if (active_overlay_ || !Animation::ShouldRenderRichAnimation())
+  if (active_overlay_ || !ui::Animation::ShouldRenderRichAnimation())
     return;
 
 #if !defined(OS_WIN)
   // TODO: fix this. I'm disabling as z-order isn't right on linux so that
   // overlay ends up obscuring the omnibox.
   return;
 #endif
 
-  overlay_animation_.reset(new SlideAnimation(this));
+  overlay_animation_.reset(new ui::SlideAnimation(this));
   overlay_animation_->SetDuration(300);
   overlay_animation_->SetSlideDuration(300);
   overlay_animation_->Show();
 
   CreateOverlay(kMinOpacity);
 }
 
 void ContentsContainer::ShowFade() {
-  if (active_overlay_ || !Animation::ShouldRenderRichAnimation())
+  if (active_overlay_ || !ui::Animation::ShouldRenderRichAnimation())
     return;
 
   CreateOverlay(kMaxOpacity);
 }
 
 void ContentsContainer::RemoveFade() {
   overlay_animation_.reset();
   if (active_overlay_) {
     overlay_view_->Detach();
     overlay_view_ = NULL;
     active_overlay_->Close();
     active_overlay_ = NULL;
   }
 }
 
-void ContentsContainer::AnimationProgressed(const Animation* animation) {
+void ContentsContainer::AnimationProgressed(const ui::Animation* animation) {
   active_overlay_->SetOpacity(
-      Tween::ValueBetween(animation->GetCurrentValue(), kMinOpacity,
-                          kMaxOpacity));
+      ui::Tween::ValueBetween(animation->GetCurrentValue(), kMinOpacity,
+                              kMaxOpacity));
   active_overlay_->GetRootView()->SchedulePaint();
 }
 
 void ContentsContainer::Layout() {
   // The active view always gets the full bounds.
   active_->SetBounds(0, active_top_margin_, width(),
                      std::max(0, height() - active_top_margin_));
 
   if (preview_)
     preview_->SetBounds(0, 0, width(), height());
@@ skipping 19 matching lines @@
       views::Background::CreateSolidBackground(SK_ColorWHITE));
   active_overlay_->SetContentsView(overlay_view_);
   active_overlay_->Show();
   active_overlay_->MoveAbove(active_->GetWidget());
 }
 
 void ContentsContainer::OverlayViewDestroyed() {
   active_overlay_ = NULL;
   overlay_view_ = NULL;
 }