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

chrome/browser/ui/views/dropdown_bar_host.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/dropdown_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/gfx/scoped_sk_region.h"
 #elif defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
@@ skipping 54 matching lines @@
   focus_manager_ = host_->GetFocusManager();
   if (focus_manager_) {
     focus_manager_->AddFocusChangeListener(this);
   } else {
     // In some cases (see bug http://crbug.com/17056) it seems we may not have
     // a focus manager.  Please reopen the bug if you hit this.
     NOTREACHED();
   }
 
   // Start the process of animating the opening of the widget.
-  animation_.reset(new ui::SlideAnimation(this));
+  animation_.reset(new gfx::SlideAnimation(this));
 }
 
 DropdownBarHost::~DropdownBarHost() {
   focus_manager_->RemoveFocusChangeListener(this);
   focus_tracker_.reset(NULL);
 }
 
 void DropdownBarHost::Show(bool animate) {
   // Stores the currently focused view, and tracks focus changes so that we can
   // restore focus when the dropdown widget is closed.
@@ skipping 76 matching lines @@
     // original handler for Escape.
     UnregisterAccelerators();
   }
 }
 
 void DropdownBarHost::OnDidChangeFocus(views::View* focused_before,
                                        views::View* focused_now) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DropdownBarHost, ui::AnimationDelegate implementation:
+// DropdownBarHost, gfx::AnimationDelegate implementation:
 
-void DropdownBarHost::AnimationProgressed(const ui::Animation* animation) {
+void DropdownBarHost::AnimationProgressed(const gfx::Animation* animation) {
   // First, we calculate how many pixels to slide the widget.
   gfx::Size pref_size = view_->GetPreferredSize();
   animation_offset_ = static_cast<int>((1.0 - animation_->GetCurrentValue()) *
                                        pref_size.height());
 
   // This call makes sure it appears in the right location, the size and shape
   // is correct and that it slides in the right direction.
   gfx::Rect dlg_rect = GetDialogPosition(gfx::Rect());
   SetDialogPosition(dlg_rect, false);
 
   // Let the view know if we are animating, and at which offset to draw the
   // edges.
   delegate_->SetAnimationOffset(animation_offset_);
   view_->SchedulePaint();
 }
 
-void DropdownBarHost::AnimationEnded(const ui::Animation* animation) {
+void DropdownBarHost::AnimationEnded(const gfx::Animation* animation) {
   // Place the dropdown widget in its fully opened state.
   animation_offset_ = 0;
 
   if (!animation_->IsShowing()) {
     // Animation has finished closing.
     host_->Hide();
     is_visible_ = false;
     OnVisibilityChanged();
   } else {
     // Animation has finished opening.
@@ skipping 131 matching lines @@
       escape, ui::AcceleratorManager::kNormalPriority, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
   ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }