| Index: chrome/browser/ui/views/tabs/base_tab_strip.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/tabs/base_tab_strip.cc (revision 70685)
|
| +++ chrome/browser/ui/views/tabs/base_tab_strip.cc (working copy)
|
| @@ -25,11 +25,11 @@
|
| explicit ResetDraggingStateDelegate(BaseTab* tab) : tab_(tab) {
|
| }
|
|
|
| - virtual void AnimationEnded(const Animation* animation) {
|
| + virtual void AnimationEnded(const ui::Animation* animation) {
|
| tab_->set_dragging(false);
|
| }
|
|
|
| - virtual void AnimationCanceled(const Animation* animation) {
|
| + virtual void AnimationCanceled(const ui::Animation* animation) {
|
| tab_->set_dragging(false);
|
| }
|
|
|
| @@ -51,11 +51,11 @@
|
| tab_(tab) {
|
| }
|
|
|
| - virtual void AnimationEnded(const Animation* animation) {
|
| + virtual void AnimationEnded(const ui::Animation* animation) {
|
| CompleteRemove();
|
| }
|
|
|
| - virtual void AnimationCanceled(const Animation* animation) {
|
| + virtual void AnimationCanceled(const ui::Animation* animation) {
|
| // We can be canceled for two interesting reasons:
|
| // . The tab we reference was dragged back into the tab strip. In this case
|
| // we don't want to remove the tab (closing is false).
|
| @@ -463,7 +463,7 @@
|
| }
|
| }
|
|
|
| -AnimationDelegate* BaseTabStrip::CreateRemoveTabDelegate(BaseTab* tab) {
|
| +ui::AnimationDelegate* BaseTabStrip::CreateRemoveTabDelegate(BaseTab* tab) {
|
| return new RemoveTabDelegate(this, tab);
|
| }
|
|
|
|
|