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

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

Issue 11881042: highlight intermediate tabs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable tests for win7_aura Created 7 years, 10 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1a54dc003c87ed40f44a8403b6cedd0e860ee9da..5bb4840b25a3976fc573e9f2cc4756b32c88ac4e 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);
@@ -2349,10 +2353,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)
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698