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

chrome/browser/ui/gtk/location_bar_view_gtk.cc

 // Copyright 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/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 165 matching lines @@
                                    public BubbleDelegateGtk {
  public:
   ContentSettingImageViewGtk(ContentSettingsType content_type,
                              LocationBarViewGtk* parent);
   virtual ~ContentSettingImageViewGtk();
 
   // PageToolViewGtk
   virtual void UpdatePreLayout(WebContents* web_contents) OVERRIDE;
   virtual void UpdatePostLayout(WebContents* web_contents) OVERRIDE;
 
-  // ui::AnimationDelegate
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
  private:
   // PageToolViewGtk
   virtual GdkColor button_border_color() const OVERRIDE;
   virtual GdkColor gradient_top_color() const OVERRIDE;
   virtual GdkColor gradient_bottom_color() const OVERRIDE;
   virtual void OnClick(GtkWidget* sender) OVERRIDE;
 
   // BubbleDelegateGtk
   virtual void BubbleClosing(BubbleGtk* bubble,
@@ skipping 83 matching lines @@
   if (!content_settings->IsBlockageIndicated(
       content_setting_image_model_->get_content_settings_type())) {
     if (content_setting_image_model_->ShouldShowBubbleOnBlockage())
       CreateBubble(web_contents);
     content_settings->SetBlockageHasBeenIndicated(
         content_setting_image_model_->get_content_settings_type());
   }
 }
 
 void ContentSettingImageViewGtk::AnimationEnded(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (animation_.IsShowing()) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&ContentSettingImageViewGtk::CloseAnimation,
                    weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kContentSettingImageDisplayTime));
   } else {
     gtk_widget_hide(label_.get());
     gtk_util::StopActingAsRoundedWindow(event_box_.get());
     gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_.get()), FALSE);
@@ skipping 1501 matching lines @@
   gtk_widget_show(label_.get());
 
   animation_.Show();
 }
 
 void LocationBarViewGtk::PageToolViewGtk::CloseAnimation() {
   animation_.Hide();
 }
 
 void LocationBarViewGtk::PageToolViewGtk::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   gtk_widget_set_size_request(
       label_.get(),
       animation->GetCurrentValue() * label_req_.width,
       -1);
 }
 
 void LocationBarViewGtk::PageToolViewGtk::AnimationEnded(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
 }
 
 void LocationBarViewGtk::PageToolViewGtk::AnimationCanceled(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
 }
 
 gboolean LocationBarViewGtk::PageToolViewGtk::OnButtonPressed(
     GtkWidget* sender, GdkEvent* event) {
   OnClick(sender);
   return TRUE;
 }
 
 gboolean LocationBarViewGtk::PageToolViewGtk::OnExpose(
     GtkWidget* sender, GdkEventExpose* event) {
@@ skipping 341 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }