| Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| index 37ab716a24ce93094867022a9e20c1d015aaeab3..5aa2b0f83de7170ac837d2ff9ec5701d60e31c06 100644
|
| --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
|
| @@ -27,7 +27,7 @@
|
| #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"
|
| @@ -271,7 +271,7 @@ ImmersiveModeControllerAsh::ImmersiveModeControllerAsh()
|
| 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) {
|
| }
|
| @@ -529,7 +529,7 @@ void ImmersiveModeControllerAsh::OnWidgetActivationChanged(
|
| // 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.
|
| @@ -540,7 +540,7 @@ void ImmersiveModeControllerAsh::AnimationEnded(
|
| }
|
|
|
| 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
|
|
|