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

chrome/browser/ui/views/download/download_shelf_view.cc

 // Copyright (c) 2012 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/ui/views/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/download/download_item_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/mouse_watcher_view_host.h"
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
 static const size_t kMaxDownloadViews = 15;
@@ skipping 162 matching lines @@
   }
   prefsize.Enlarge(0, kTopBottomPadding + kTopBottomPadding);
   if (shelf_animation_->is_animating()) {
     prefsize.set_height(static_cast<int>(
         static_cast<double>(prefsize.height()) *
                             shelf_animation_->GetCurrentValue()));
   }
   return prefsize;
 }
 
-void DownloadShelfView::AnimationProgressed(const ui::Animation *animation) {
+void DownloadShelfView::AnimationProgressed(const gfx::Animation *animation) {
   if (animation == new_item_animation_.get()) {
     Layout();
     SchedulePaint();
   } else if (animation == shelf_animation_.get()) {
     // Force a re-layout of the parent, which will call back into
     // GetPreferredSize, where we will do our animation. In the case where the
     // animation is hiding, we do a full resize - the fast resizing would
     // otherwise leave blank white areas where the shelf was and where the
     // user's eye is. Thankfully bottom-resizing is a lot faster than
     // top-resizing.
     parent_->ToolbarSizeChanged(shelf_animation_->IsShowing());
   }
 }
 
-void DownloadShelfView::AnimationEnded(const ui::Animation *animation) {
+void DownloadShelfView::AnimationEnded(const gfx::Animation *animation) {
   if (animation == shelf_animation_.get()) {
     parent_->SetDownloadShelfVisible(shelf_animation_->IsShowing());
     if (!shelf_animation_->IsShowing())
       Closed();
   }
 }
 
 void DownloadShelfView::Layout() {
   // Let our base class layout our child views
   views::View::Layout();
@@ skipping 86 matching lines @@
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     AddChildView(close_button_);
 
     UpdateColorsFromTheme();
 
-    new_item_animation_.reset(new ui::SlideAnimation(this));
+    new_item_animation_.reset(new gfx::SlideAnimation(this));
     new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
 
-    shelf_animation_.reset(new ui::SlideAnimation(this));
+    shelf_animation_.reset(new gfx::SlideAnimation(this));
     shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
   }
 }
 
 bool DownloadShelfView::CanFitFirstDownloadItem() {
   if (download_views_.empty())
     return true;
 
   gfx::Size image_size = arrow_image_->GetPreferredSize();
   gfx::Size close_button_size = close_button_->GetPreferredSize();
@@ skipping 124 matching lines @@
     const DownloadItemView* download_item_view) {
   gfx::Rect bounds = download_item_view->bounds();
 
 #if defined(TOOLKIT_VIEWS)
   bounds.set_height(bounds.height() - 1);
   bounds.Offset(0, 3);
 #endif
 
   return bounds;
 }