Re-land:

chrome/browser/ui/views/tabs/base_tab_strip.cc

 // Copyright (c) 2011 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/ui/views/tabs/base_tab_strip.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/title_prefix_matcher.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tabs/dragged_tab_controller.h"
@@ skipping 76 matching lines @@
       // This function is not required (and indeed may crash!) for removes
       // spawned by non-mouse closes and drag-detaches.
       return;
     }
 
 #if defined(OS_WIN)
     views::Widget* widget = tabstrip_->GetWidget();
     // This can be null during shutdown. See http://crbug.com/42737.
     if (!widget)
       return;
+
+    widget->ResetLastMouseMoveFlag();
+
     // Force the close button (that slides under the mouse) to highlight by
     // saying the mouse just moved, but sending the same coordinates.
     DWORD pos = GetMessagePos();
     POINT cursor_point = {GET_X_LPARAM(pos), GET_Y_LPARAM(pos)};
     MapWindowPoints(NULL, widget->GetNativeView(), &cursor_point, 1);
-
-    static_cast<views::WidgetWin*>(widget)->ResetLastMouseMoveFlag();
-    // Return to message loop - otherwise we may disrupt some operation that's
-    // in progress.
     SendMessage(widget->GetNativeView(), WM_MOUSEMOVE, 0,
                 MAKELPARAM(cursor_point.x, cursor_point.y));
 #else
     NOTIMPLEMENTED();
 #endif
   }
 
   BaseTabStrip* tabstrip_;
   BaseTab* tab_;
 
@@ skipping 478 matching lines @@
     // Animate the view back to its correct position.
     GenerateIdealBounds();
     AnimateToIdealBounds();
   }
   bounds_animator_.AnimateViewTo(tab, ideal_bounds(TabIndexOfTab(tab)));
   // Install a delegate to reset the dragging state when done. We have to leave
   // dragging true for the tab otherwise it'll draw beneath the new tab button.
   bounds_animator_.SetAnimationDelegate(
       tab, new ResetDraggingStateDelegate(tab), true);
 }