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

chrome/browser/ui/gtk/notifications/balloon_view_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/notifications/balloon_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_hig_constants.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.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace {
 
 // Margin, in pixels, between the notification frame and the contents
 // of the notification.
 const int kTopMargin = 0;
 const int kBottomMargin = 1;
@@ skipping 116 matching lines @@
   gtk_window_get_position(GTK_WINDOW(frame_container_), &start_x, &start_y);
   gtk_window_get_size(GTK_WINDOW(frame_container_), &start_w, &start_h);
 
   int end_x = balloon_->GetPosition().x();
   int end_y = balloon_->GetPosition().y();
   int end_w = GetDesiredTotalWidth();
   int end_h = GetDesiredTotalHeight();
 
   anim_frame_start_ = gfx::Rect(start_x, start_y, start_w, start_h);
   anim_frame_end_ = gfx::Rect(end_x, end_y, end_w, end_h);
-  animation_.reset(new ui::SlideAnimation(this));
+  animation_.reset(new gfx::SlideAnimation(this));
   animation_->Show();
 }
 
-void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
+void BalloonViewImpl::AnimationProgressed(const gfx::Animation* animation) {
   DCHECK_EQ(animation, animation_.get());
 
   // Linear interpolation from start to end position.
   double end = animation->GetCurrentValue();
   double start = 1.0 - end;
 
   gfx::Rect frame_position(
       static_cast<int>(start * anim_frame_start_.x() +
                        end * anim_frame_end_.x()),
       static_cast<int>(start * anim_frame_start_.y() +
@@ skipping 274 matching lines @@
         base::Bind(
             &BalloonViewImpl::DelayedClose, weak_factory_.GetWeakPtr(), false));
   }
 }
 
 gboolean BalloonViewImpl::OnDestroy(GtkWidget* widget) {
   frame_container_ = NULL;
   Close(false);
   return FALSE;  // Propagate.
 }