Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(882)

Unified Diff: chrome/browser/ui/views/tabs/base_tab_strip.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab_strip.h ('k') | chrome/browser/ui/views/tabs/dragged_tab_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698