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

chrome/browser/ui/views/panels/panel_stack_view.cc

 // Copyright (c) 2013 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/panels/panel_stack_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/stacked_panel_collection.h"
 #include "chrome/browser/ui/views/panels/panel_view.h"
-#include "ui/base/animation/linear_animation.h"
+#include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/shell_integration.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
@@ skipping 126 matching lines @@
     if (!bounds_updates_.empty()) {
       UpdatePanelsBounds();
       bounds_updates_.clear();
     }
 
     bounds_updates_started_ = false;
     NotifyBoundsUpdateCompleted();
     return;
   }
 
-  bounds_animator_.reset(new ui::LinearAnimation(
+  bounds_animator_.reset(new gfx::LinearAnimation(
       PanelManager::AdjustTimeInterval(kSetBoundsAnimationMs),
       kDefaultFramerateHz,
       this));
   bounds_animator_->Start();
 }
 
 void PanelStackView::NotifyBoundsUpdateCompleted() {
   delegate_->PanelBoundsBatchUpdateCompleted();
 
 #if defined(OS_WIN)
@@ skipping 134 matching lines @@
 #if defined(OS_WIN)
   if (!panels_.empty() && window_ && focused_now == window_->GetNativeView()) {
     Panel* panel_to_focus =
         panels_.front()->stack()->most_recently_active_panel();
     if (panel_to_focus)
       panel_to_focus->Activate();
   }
 #endif
 }
 
-void PanelStackView::AnimationEnded(const ui::Animation* animation) {
+void PanelStackView::AnimationEnded(const gfx::Animation* animation) {
   bounds_updates_started_ = false;
 
   PanelManager* panel_manager = PanelManager::GetInstance();
   for (BoundsUpdates::const_iterator iter = bounds_updates_.begin();
        iter != bounds_updates_.end(); ++iter) {
     panel_manager->OnPanelAnimationEnded(iter->first);
   }
   bounds_updates_.clear();
 
   NotifyBoundsUpdateCompleted();
 }
 
-void PanelStackView::AnimationProgressed(const ui::Animation* animation) {
+void PanelStackView::AnimationProgressed(const gfx::Animation* animation) {
   UpdatePanelsBounds();
 }
 
 void PanelStackView::UpdatePanelsBounds() {
 #if defined(OS_WIN)
   // Add an extra count for the background stack window.
   HDWP defer_update = ::BeginDeferWindowPos(bounds_updates_.size() + 1);
 #endif
 
   // Update the bounds for each panel in the update list.
@@ skipping 197 matching lines @@
   ::DeferWindowPos(defer_window_pos_info,
                     views::HWNDForWidget(window),
                     NULL,
                     bounds.x(),
                     bounds.y(),
                     bounds.width(),
                     bounds.height(),
                     SWP_NOACTIVATE | SWP_NOZORDER);
 }
 #endif