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

ui/views/bubble/bubble_delegate.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 "ui/views/bubble/bubble_delegate.h"
 
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
@@ skipping 245 matching lines @@
 void BubbleDelegateView::StartFade(bool fade_in) {
 #if defined(USE_AURA)
   // Use AURA's window layer animation instead of fading. This ensures that
   // hosts which rely on the layer animation callbacks to close the window
   // work correctly.
   if (fade_in)
     GetWidget()->Show();
   else
     GetWidget()->Close();
 #else
-  fade_animation_.reset(new ui::SlideAnimation(this));
+  fade_animation_.reset(new gfx::SlideAnimation(this));
   fade_animation_->SetSlideDuration(GetFadeDuration());
   fade_animation_->Reset(fade_in ? 0.0 : 1.0);
   if (fade_in) {
     original_opacity_ = 0;
     if (border_widget_)
       border_widget_->SetOpacity(original_opacity_);
     GetWidget()->SetOpacity(original_opacity_);
     GetWidget()->Show();
     fade_animation_->Show();
   } else {
@@ skipping 32 matching lines @@
   if (fade_animation_.get())
     fade_animation_->Reset();
   GetWidget()->Close();
   return true;
 }
 
 void BubbleDelegateView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   UpdateColorsFromTheme(theme);
 }
 
-void BubbleDelegateView::AnimationEnded(const ui::Animation* animation) {
+void BubbleDelegateView::AnimationEnded(const gfx::Animation* animation) {
   if (animation != fade_animation_.get())
     return;
   bool closed = fade_animation_->GetCurrentValue() == 0;
   fade_animation_->Reset();
   if (closed)
     GetWidget()->Close();
 }
 
-void BubbleDelegateView::AnimationProgressed(const ui::Animation* animation) {
+void BubbleDelegateView::AnimationProgressed(const gfx::Animation* animation) {
   if (animation != fade_animation_.get())
     return;
   DCHECK(fade_animation_->is_animating());
   unsigned char opacity = fade_animation_->GetCurrentValue() * 255;
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Explicitly set the content Widget's layered style and set transparency via
   // SetLayeredWindowAttributes. This is done because initializing the Widget as
   // transparent and setting opacity via UpdateLayeredWindow doesn't support
   // hosting child native Windows controls.
   const HWND hwnd = GetWidget()->GetNativeView();
@@ skipping 70 matching lines @@
       border_widget_->ShowInactive();
     if (anchor_widget() && anchor_widget()->GetTopLevelWidget())
       anchor_widget()->GetTopLevelWidget()->DisableInactiveRendering();
   } else {
     if (border_widget_)
       border_widget_->Hide();
   }
 }
 
 }  // namespace views