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

chrome/browser/ui/views/location_bar/content_setting_image_view.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/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 68 matching lines @@
       color_utils::AlphaBlend(SkColorSetA(background_image_color, 255),
                               parent_background_color,
                               SkColorGetA(background_image_color)));
   text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   text_label_->SetElideBehavior(views::Label::NO_ELIDE);
   AddChildView(text_label_);
 
   LocationBarView::InitTouchableLocationBarChildView(this);
 
   slide_animator_.SetSlideDuration(kAnimationDurationMS);
-  slide_animator_.SetTweenType(ui::Tween::LINEAR);
+  slide_animator_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_)
     bubble_widget_->RemoveObserver(this);
 }
 
 void ContentSettingImageView::UpdatePreLayout(
     content::WebContents* web_contents) {
   // Note: We explicitly want to call this even if |web_contents| is NULL, so we
@@ skipping 52 matching lines @@
         content_setting_image_model_->get_content_settings_type());
   }
 }
 
 // static
 int ContentSettingImageView::GetBubbleOuterPadding(bool by_icon) {
   return LocationBarView::GetItemPadding() - LocationBarView::kBubblePadding +
       (by_icon ? 0 : LocationBarView::kIconInternalPadding);
 }
 
-void ContentSettingImageView::AnimationEnded(const ui::Animation* animation) {
+void ContentSettingImageView::AnimationEnded(const gfx::Animation* animation) {
   slide_animator_.Reset();
   if (!pause_animation_) {
     text_label_->SetVisible(false);
     parent_->Layout();
     parent_->SchedulePaint();
   }
 }
 
 void ContentSettingImageView::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (!pause_animation_) {
     parent_->Layout();
     parent_->SchedulePaint();
   }
 }
 
 void ContentSettingImageView::AnimationCanceled(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 gfx::Size ContentSettingImageView::GetPreferredSize() {
   // Height will be ignored by the LocationBarView.
   gfx::Size size(icon_->GetPreferredSize());
   if (background_showing()) {
     double state = slide_animator_.GetCurrentValue();
     // The fraction of the animation we'll spend animating the string into view,
     // which is also the fraction we'll spend animating it closed; total
@@ skipping 85 matching lines @@
       parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
           ContentSettingBubbleModel::CreateContentSettingBubbleModel(
               parent_->delegate()->GetContentSettingBubbleModelDelegate(),
               web_contents, parent_->profile(),
               content_setting_image_model_->get_content_settings_type()),
           web_contents, this, views::BubbleBorder::TOP_RIGHT));
   bubble_widget_->AddObserver(this);
   bubble_widget_->Show();
 }