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

chrome/browser/ui/gtk/status_bubble_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/status_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
 #include "content/public/browser/notification_source.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_compat.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 // Inner padding between the border and the text label.
 const int kInternalTopBottomPadding = 1;
 const int kInternalLeftRightPadding = 2;
 
@@ skipping 301 matching lines @@
           gtk_util::ROUNDED_TOP_RIGHT,
       gtk_util::BORDER_TOP |
           (flip_horizontally ? gtk_util::BORDER_LEFT : gtk_util::BORDER_RIGHT));
   gtk_widget_queue_draw(container_.get());
 }
 
 void StatusBubbleGtk::ExpandURL() {
   GtkAllocation allocation;
   gtk_widget_get_allocation(label_.get(), &allocation);
   start_width_ = allocation.width;
-  expand_animation_.reset(new ui::SlideAnimation(this));
-  expand_animation_->SetTweenType(ui::Tween::LINEAR);
+  expand_animation_.reset(new gfx::SlideAnimation(this));
+  expand_animation_->SetTweenType(gfx::Tween::LINEAR);
   expand_animation_->Show();
 
   SetStatusTextToURL();
 }
 
 void StatusBubbleGtk::UpdateLabelSizeRequest() {
   if (!expanded() || !expand_animation_->is_animating()) {
     gtk_widget_set_size_request(label_.get(), -1, -1);
     return;
   }
@@ skipping 10 matching lines @@
   MouseMoved(gfx::Point(event->x_root, event->y_root), false);
   return FALSE;
 }
 
 gboolean StatusBubbleGtk::HandleMotionNotify(GtkWidget* sender,
                                              GdkEventMotion* event) {
   MouseMoved(gfx::Point(event->x_root, event->y_root), false);
   return FALSE;
 }
 
-void StatusBubbleGtk::AnimationEnded(const ui::Animation* animation) {
+void StatusBubbleGtk::AnimationEnded(const gfx::Animation* animation) {
   UpdateLabelSizeRequest();
 }
 
-void StatusBubbleGtk::AnimationProgressed(const ui::Animation* animation) {
+void StatusBubbleGtk::AnimationProgressed(const gfx::Animation* animation) {
   UpdateLabelSizeRequest();
 }