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

chrome/browser/ui/views/frame/immersive_mode_controller_ash.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/views/frame/immersive_mode_controller_ash.h"
 
 #include <set>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 using views::View;
 
 namespace {
 
 // The slide open/closed animation looks better if it starts and ends just a
@@ skipping 223 matching lines @@
       widget_(NULL),
       top_container_(NULL),
       observers_enabled_(false),
       enabled_(false),
       reveal_state_(CLOSED),
       revealed_lock_count_(0),
       tab_indicator_visibility_(TAB_INDICATORS_HIDE),
       mouse_x_when_hit_top_in_screen_(-1),
       gesture_begun_(false),
       native_window_(NULL),
-      animation_(new ui::SlideAnimation(this)),
+      animation_(new gfx::SlideAnimation(this)),
       animations_disabled_for_test_(false),
       weak_ptr_factory_(this) {
 }
 
 ImmersiveModeControllerAsh::~ImmersiveModeControllerAsh() {
   // The browser view is being destroyed so there's no need to update its
   // layout or layers, even if the top views are revealed. But the window
   // observers still need to be removed.
   EnableWindowObservers(false);
 }
@@ skipping 237 matching lines @@
   // stay revealed. We cannot call UpdateLocatedEventRevealedLock() from
   // BubbleManager::UpdateRevealedLock() because |widget| is not yet active
   // at that time.
   UpdateLocatedEventRevealedLock(NULL, ALLOW_REVEAL_WHILE_CLOSING_YES);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Animation delegate:
 
 void ImmersiveModeControllerAsh::AnimationEnded(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (reveal_state_ == SLIDING_OPEN) {
     // AnimationProgressed() is called immediately before AnimationEnded()
     // and does a layout.
     OnSlideOpenAnimationCompleted(LAYOUT_NO);
   } else if (reveal_state_ == SLIDING_CLOSED) {
     OnSlideClosedAnimationCompleted();
   }
 }
 
 void ImmersiveModeControllerAsh::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   // Relayout. This will also move any views whose position depends on the
   // top container position such as the find bar.
   // We do not call LayoutBrowserRootView() here because we are not toggling
   // the tab strip's immersive style so relaying out the non client view is not
   // necessary.
   top_container_->parent()->Layout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
@@ skipping 615 matching lines @@
     aura::Window* transient_child = transient_children[i];
     views::BubbleDelegateView* bubble_delegate =
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->anchor_view() &&
         top_container_->Contains(bubble_delegate->anchor_view())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }