Always simulate a mouse movement after animations in the Linux tabstrip to ma...

chrome/browser/gtk/tabs/tab_strip_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/tabs/tab_button_gtk.h"
@@ skipping 115 matching lines @@
     return tab_width;
   }
 
   // Overridden from AnimationDelegate:
   virtual void AnimationProgressed(const Animation* animation) {
     tabstrip_->AnimationLayout(end_unselected_width_);
   }
 
   virtual void AnimationEnded(const Animation* animation) {
     tabstrip_->FinishAnimation(this, layout_on_completion_);
+    // TODO(jhawkins): Remove this once each tab is its own widget.
+    SimulateMouseMotion();
     // This object is destroyed now, so we can't do anything else after this.
   }
 
   virtual void AnimationCanceled(const Animation* animation) {
     AnimationEnded(animation);
   }
 
  protected:
   // Returns the duration of the animation.
   virtual int GetDuration() const {
@@ skipping 30 matching lines @@
 
   TabStripGtk* tabstrip_;
   SlideAnimation animation_;
 
   double start_selected_width_;
   double start_unselected_width_;
   double end_selected_width_;
   double end_unselected_width_;
 
  private:
+  // When the animation completes, we send the Container a message to simulate
+  // a mouse moved event at the current mouse position. This tickles the Tab
+  // the mouse is currently over to show the "hot" state of the close button, or
+  // resets the hover index if it's now stale.
+  void SimulateMouseMotion() {
+    // Get default display and screen.
+    GdkDisplay* display = gdk_display_get_default();
+    GdkScreen* screen = gdk_display_get_default_screen(display);
+
+    // Get cursor position.
+    int x, y;
+    gdk_display_get_pointer(display, NULL, &x, &y, NULL);
+
+    // Reset cursor position.
+    gdk_display_warp_pointer(display, screen, x, y);
+  }
+
   // True if a complete re-layout is required upon completion of the animation.
   // Subclasses set this if they don't perform a complete layout
   // themselves and canceling the animation may leave the strip in an
   // inconsistent state.
   bool layout_on_completion_;
 
   const Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAnimation);
 };
@@ skipping 91 matching lines @@
       double delta = end_selected_width_ - start_selected_width_;
       return start_selected_width_ + (delta * animation_.GetCurrentValue());
     }
 
     double delta = end_unselected_width_ - start_unselected_width_;
     return start_unselected_width_ + (delta * animation_.GetCurrentValue());
   }
 
   virtual void AnimationEnded(const Animation* animation) {
     tabstrip_->RemoveTabAt(index_);
-    HighlightCloseButton();
     TabStripGtk::TabAnimation::AnimationEnded(animation);
   }
 
  private:
-  // When the animation completes, we send the Container a message to simulate
-  // a mouse moved event at the current mouse position. This tickles the Tab
-  // the mouse is currently over to show the "hot" state of the close button.
-  void HighlightCloseButton() {
-    if (tabstrip_->available_width_for_tabs_ == -1) {
-      // This function is not required (and indeed may crash!) for removes
-      // spawned by non-mouse closes and drag-detaches.
-      return;
-    }
-
-    // Get default display and screen.
-    GdkDisplay* display = gdk_display_get_default();
-    GdkScreen* screen = gdk_display_get_default_screen(display);
-
-    // Get cursor position.
-    int x, y;
-    gdk_display_get_pointer(display, NULL, &x, &y, NULL);
-
-    // Reset cusor position.
-    gdk_display_warp_pointer(display, screen, x, y);
-  }
-
   int index_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveTabAnimation);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Handles the movement of a Tab from one position to another.
 class MoveTabAnimation : public TabStripGtk::TabAnimation {
  public:
@@ skipping 1126 matching lines @@
   return TabStripModel::kNoTab;
 }
 
 int TabStripGtk::NormalizeIndexToAttachedTabStrip(int index) {
   if (index >= model_->count())
     return model_->count() - 1;
   if (index == TabStripModel::kNoTab)
     return 0;
   return index;
 }