Index: chrome/browser/ui/views/tabs/tab_strip.cc |
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc |
index 21638bd650656b814b7bdda1a705eba4ea95d16c..17e15793ff10b3acbafc4a805cc8cd61cd7502e8 100644 |
--- a/chrome/browser/ui/views/tabs/tab_strip.cc |
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc |
@@ -30,14 +30,14 @@ |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "ui/base/accessibility/accessible_view_state.h" |
-#include "ui/base/animation/animation_container.h" |
-#include "ui/base/animation/throb_animation.h" |
#include "ui/base/default_theme_provider.h" |
#include "ui/base/dragdrop/drag_drop_types.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/layout.h" |
#include "ui/base/models/list_selection_model.h" |
#include "ui/base/resource/resource_bundle.h" |
+#include "ui/gfx/animation/animation_container.h" |
+#include "ui/gfx/animation/throb_animation.h" |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/image/image_skia.h" |
#include "ui/gfx/image/image_skia_operations.h" |
@@ -240,11 +240,11 @@ class ResetDraggingStateDelegate |
explicit ResetDraggingStateDelegate(Tab* tab) : tab_(tab) { |
} |
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE { |
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE { |
tab_->set_dragging(false); |
} |
- virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE { |
+ virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE { |
tab_->set_dragging(false); |
} |
@@ -527,8 +527,8 @@ class TabStrip::RemoveTabDelegate |
public: |
RemoveTabDelegate(TabStrip* tab_strip, Tab* tab); |
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; |
- virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE; |
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; |
+ virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; |
private: |
void CompleteRemove(); |
@@ -551,12 +551,12 @@ TabStrip::RemoveTabDelegate::RemoveTabDelegate(TabStrip* tab_strip, |
} |
void TabStrip::RemoveTabDelegate::AnimationEnded( |
- const ui::Animation* animation) { |
+ const gfx::Animation* animation) { |
CompleteRemove(); |
} |
void TabStrip::RemoveTabDelegate::AnimationCanceled( |
- const ui::Animation* animation) { |
+ const gfx::Animation* animation) { |
CompleteRemove(); |
} |
@@ -598,7 +598,7 @@ TabStrip::TabStrip(TabStripController* controller) |
current_selected_width_(Tab::GetStandardSize().width()), |
available_width_for_tabs_(-1), |
in_tab_close_(false), |
- animation_container_(new ui::AnimationContainer()), |
+ animation_container_(new gfx::AnimationContainer()), |
bounds_animator_(this), |
layout_type_(TAB_STRIP_LAYOUT_SHRINK), |
adjust_layout_(false), |