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

chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/debug/trace_event.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_utils.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
-#include "ui/base/animation/slide_animation.h"
-#include "ui/base/animation/throb_animation.h"
 #include "ui/base/gtk/gtk_screen_util.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/animation/throb_animation.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/gtk_compat.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/pango_util.h"
 #include "ui/gfx/platform_font_pango.h"
 #include "ui/gfx/skbitmap_operations.h"
 
@@ skipping 225 matching lines @@
       app(false),
       capture_state(NONE) {
 }
 
 TabRendererGtk::TabData::~TabData() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // FaviconCrashAnimation
 //
 //  A custom animation subclass to manage the favicon crash animation.
-class TabRendererGtk::FaviconCrashAnimation : public ui::LinearAnimation,
-                                              public ui::AnimationDelegate {
+class TabRendererGtk::FaviconCrashAnimation : public gfx::LinearAnimation,
+                                              public gfx::AnimationDelegate {
  public:
   explicit FaviconCrashAnimation(TabRendererGtk* target)
-      : ui::LinearAnimation(1000, 25, this),
+      : gfx::LinearAnimation(1000, 25, this),
         target_(target) {
   }
   virtual ~FaviconCrashAnimation() {}
 
-  // ui::Animation overrides:
+  // gfx::Animation overrides:
   virtual void AnimateToState(double state) OVERRIDE {
     const double kHidingOffset = 27;
 
     if (state < .5) {
       target_->SetFaviconHidingOffset(
           static_cast<int>(floor(kHidingOffset * 2.0 * state)));
     } else {
       target_->DisplayCrashedFavicon();
       target_->SetFaviconHidingOffset(
           static_cast<int>(
               floor(kHidingOffset - ((state - .5) * 2.0 * kHidingOffset))));
     }
   }
 
-  // ui::AnimationDelegate overrides:
-  virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE {
+  // gfx::AnimationDelegate overrides:
+  virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE {
     target_->SetFaviconHidingOffset(0);
   }
 
  private:
   TabRendererGtk* target_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconCrashAnimation);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 20 matching lines @@
 
   tab_.Own(gtk_fixed_new());
   gtk_widget_set_app_paintable(tab_.get(), TRUE);
   g_signal_connect(tab_.get(), "expose-event",
                    G_CALLBACK(OnExposeEventThunk), this);
   g_signal_connect(tab_.get(), "size-allocate",
                    G_CALLBACK(OnSizeAllocateThunk), this);
   close_button_.reset(MakeCloseButton());
   gtk_widget_show(tab_.get());
 
-  hover_animation_.reset(new ui::SlideAnimation(this));
+  hover_animation_.reset(new gfx::SlideAnimation(this));
   hover_animation_->SetSlideDuration(kHoverDurationMs);
 }
 
 TabRendererGtk::~TabRendererGtk() {
   tab_.Destroy();
 }
 
 void TabRendererGtk::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
@@ skipping 249 matching lines @@
   return bounds;
 }
 
 gfx::Rect TabRendererGtk::GetRequisition() const {
   return gfx::Rect(requisition_.x(), requisition_.y(),
                    requisition_.width(), requisition_.height());
 }
 
 void TabRendererGtk::StartMiniTabTitleAnimation() {
   if (!mini_title_animation_.get()) {
-    mini_title_animation_.reset(new ui::ThrobAnimation(this));
+    mini_title_animation_.reset(new gfx::ThrobAnimation(this));
     mini_title_animation_->SetThrobDuration(kMiniTitleChangeThrobDuration);
   }
 
   if (!mini_title_animation_->is_animating())
     mini_title_animation_->StartThrobbing(-1);
 }
 
 void TabRendererGtk::StopMiniTabTitleAnimation() {
   if (mini_title_animation_.get())
     mini_title_animation_->Stop();
@@ skipping 11 matching lines @@
   if (gtk_button_get_event_window(GTK_BUTTON(close_button_->widget())))
     gdk_window_raise(gtk_button_get_event_window(
         GTK_BUTTON(close_button_->widget())));
 }
 
 string16 TabRendererGtk::GetTitle() const {
   return data_.title;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// TabRendererGtk, ui::AnimationDelegate implementation:
+// TabRendererGtk, gfx::AnimationDelegate implementation:
 
-void TabRendererGtk::AnimationProgressed(const ui::Animation* animation) {
+void TabRendererGtk::AnimationProgressed(const gfx::Animation* animation) {
   gtk_widget_queue_draw(tab_.get());
 }
 
-void TabRendererGtk::AnimationCanceled(const ui::Animation* animation) {
+void TabRendererGtk::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
-void TabRendererGtk::AnimationEnded(const ui::Animation* animation) {
+void TabRendererGtk::AnimationEnded(const gfx::Animation* animation) {
   gtk_widget_queue_draw(tab_.get());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk, private:
 
 void TabRendererGtk::StartCrashAnimation() {
   if (!crash_animation_.get())
     crash_animation_.reset(new FaviconCrashAnimation(this));
   crash_animation_->Stop();
@@ skipping 34 matching lines @@
         recording.ToImageSkia()->width();
 
     GdkPixbuf* pixbuf = data_.favicon.isNull() ?
         gfx::GdkPixbufFromSkBitmap(*recording.ToSkBitmap()) :
         GetResizedGdkPixbufFromSkBitmap(*recording.ToSkBitmap(),
             icon_size, icon_size);
     data_.cairo_overlay.UsePixbuf(pixbuf);
     g_object_unref(pixbuf);
 
     if (!favicon_overlay_animation_.get()) {
-      favicon_overlay_animation_.reset(new ui::ThrobAnimation(this));
+      favicon_overlay_animation_.reset(new gfx::ThrobAnimation(this));
       favicon_overlay_animation_->SetThrobDuration(kRecordingDurationMs);
     }
     if (!favicon_overlay_animation_->is_animating())
       favicon_overlay_animation_->StartThrobbing(-1);
   } else {
     data_.cairo_overlay.Reset();
     if (favicon_overlay_animation_.get())
       favicon_overlay_animation_->Stop();
   }
 }
@@ skipping 485 matching lines @@
   // get an infinite loop of size-allocate signals.
   if (bounds_ == bounds)
     return;
 
   bounds_ = bounds;
   Layout();
 }
 
 gboolean TabRendererGtk::OnEnterNotifyEvent(GtkWidget* widget,
                                             GdkEventCrossing* event) {
-  hover_animation_->SetTweenType(ui::Tween::EASE_OUT);
+  hover_animation_->SetTweenType(gfx::Tween::EASE_OUT);
   hover_animation_->Show();
   return FALSE;
 }
 
 gboolean TabRendererGtk::OnLeaveNotifyEvent(GtkWidget* widget,
                                             GdkEventCrossing* event) {
-  hover_animation_->SetTweenType(ui::Tween::EASE_IN);
+  hover_animation_->SetTweenType(gfx::Tween::EASE_IN);
   hover_animation_->Hide();
   return FALSE;
 }
 
 // static
 void TabRendererGtk::InitResources() {
   if (initialized_)
     return;
 
   // Grab the pixel sizes of our masking images.
@@ skipping 10 matching lines @@
   GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_CLOSE_1).ToGdkPixbuf();
   close_button_width_ = gdk_pixbuf_get_width(tab_close);
   close_button_height_ = gdk_pixbuf_get_height(tab_close);
 
   const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   initialized_ = true;
 }