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

chrome/browser/ui/gtk/download/download_item_gtk.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/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/gtk/download/download_shelf_context_menu_gtk.h"
 #include "chrome/browser/ui/gtk/download/download_shelf_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_utils_gtk.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 namespace {
 
 // The width of the |menu_button_| widget. It has to be at least as wide as the
@@ skipping 144 matching lines @@
   g_signal_connect(hbox_.get(), "expose-event",
                    G_CALLBACK(OnHboxExposeThunk), this);
   gtk_box_pack_start(GTK_BOX(hbox_.get()), body_.get(), FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(hbox_.get()), menu_button_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(shelf_hbox), hbox_.get(), FALSE, FALSE, 0);
   // Insert as the leftmost item.
   gtk_box_reorder_child(GTK_BOX(shelf_hbox), hbox_.get(), 0);
 
   download()->AddObserver(this);
 
-  new_item_animation_.reset(new ui::SlideAnimation(this));
+  new_item_animation_.reset(new gfx::SlideAnimation(this));
   new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
   gtk_widget_show_all(hbox_.get());
 
   if (download_model_.IsDangerous()) {
     // Hide the download item components for now.
     gtk_widget_set_no_show_all(body_.get(), TRUE);
     gtk_widget_set_no_show_all(menu_button_, TRUE);
     gtk_widget_hide(body_.get());
     gtk_widget_hide(menu_button_);
 
@@ skipping 58 matching lines @@
   // Set the initial width of the widget to be animated.
   if (download_model_.IsDangerous()) {
     gtk_widget_set_size_request(dangerous_hbox_.get(),
                                 dangerous_hbox_start_width_, -1);
   } else {
     gtk_widget_set_size_request(body_.get(), kMinDownloadItemWidth, -1);
   }
 
   new_item_animation_->Show();
 
-  complete_animation_.SetTweenType(ui::Tween::LINEAR);
+  complete_animation_.SetTweenType(gfx::Tween::LINEAR);
   complete_animation_.SetSlideDuration(kCompleteAnimationDurationMs);
 
   // Update the status text and animation state.
   OnDownloadUpdated(download());
 }
 
 DownloadItemGtk::~DownloadItemGtk() {
   // First close the menu and then destroy the GtkWidgets. Bug#97724
   if (menu_.get())
     menu_.reset();
@@ skipping 79 matching lines @@
   status_text_ = UTF16ToUTF8(download_model_.GetStatusText());
   UpdateStatusLabel(status_text_);
 }
 
 void DownloadItemGtk::OnDownloadDestroyed(DownloadItem* download_item) {
   DCHECK_EQ(download(), download_item);
   parent_shelf_->RemoveDownloadItem(this);
   // This will delete us!
 }
 
-void DownloadItemGtk::AnimationProgressed(const ui::Animation* animation) {
+void DownloadItemGtk::AnimationProgressed(const gfx::Animation* animation) {
   if (animation == &complete_animation_) {
     gtk_widget_queue_draw(progress_area_.get());
   } else {
     DCHECK(animation == new_item_animation_.get());
     if (download_model_.IsDangerous()) {
       int progress = static_cast<int>((dangerous_hbox_full_width_ -
                                        dangerous_hbox_start_width_) *
                                       animation->GetCurrentValue());
       int showing_width = dangerous_hbox_start_width_ + progress;
       gtk_widget_set_size_request(dangerous_hbox_.get(), showing_width, -1);
@@ skipping 540 matching lines @@
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creation_time_);
   download()->ValidateDangerousDownload();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   download()->Remove();
 }