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 af0a1807cbd7288917a4b09badeeedee6b1b3242..2db0b4c8d1adc53e4ee01a1fde0b954703165a89 100644 |
--- a/chrome/browser/ui/views/tabs/tab_strip.cc |
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc |
@@ -945,6 +945,20 @@ void TabStrip::SetImmersiveStyle(bool enable) { |
} |
} |
+bool TabStrip::IsAnimating() const { |
+ return bounds_animator_.IsAnimating(); |
+} |
+ |
+void TabStrip::StopAnimating(bool layout) { |
+ if (!IsAnimating()) |
+ return; |
+ |
+ bounds_animator_.Cancel(); |
+ |
+ if (layout) |
+ DoLayout(); |
+} |
+ |
const ui::ListSelectionModel& TabStrip::GetSelectionModel() { |
return controller_->GetSelectionModel(); |
} |
@@ -1619,16 +1633,6 @@ void TabStrip::ScheduleRemoveTabAnimation(Tab* tab) { |
} |
} |
-void TabStrip::StopAnimating(bool layout) { |
- if (!IsAnimating()) |
- return; |
- |
- bounds_animator_.Cancel(); |
- |
- if (layout) |
- DoLayout(); |
-} |
- |
void TabStrip::AnimateToIdealBounds() { |
for (int i = 0; i < tab_count(); ++i) { |
Tab* tab = tab_at(i); |
@@ -2341,10 +2345,6 @@ TabStrip::DropInfo::~DropInfo() { |
/////////////////////////////////////////////////////////////////////////////// |
-bool TabStrip::IsAnimating() const { |
- return bounds_animator_.IsAnimating(); |
-} |
- |
void TabStrip::PrepareForAnimation() { |
if (!IsDragSessionActive() && !TabDragController::IsAttachedTo(this)) { |
for (int i = 0; i < tab_count(); ++i) |