Merge r11299....

chrome/browser/views/tabs/tab_strip.cc

 // Copyright (c) 2006-2008 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/views/tabs/tab_strip.h"
 
 #include "base/gfx/size.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 485 matching lines @@
 }
 
 bool TabStrip::PointIsWithinWindowCaption(const gfx::Point& point) {
   views::View* v = GetViewForPoint(point);
 
   // If there is no control at this location, claim the hit was in the title
   // bar to get a move action.
   if (v == this)
     return true;
 
-  // If the point is within the bounds of a Tab, the point can be considered
-  // part of the caption if there are no available drag operations for the Tab.
-  if (v->GetClassName() == Tab::kTabClassName && !HasAvailableDragActions())
-    return true;
-
   // Check to see if the point is within the non-button parts of the new tab
   // button. The button has a non-rectangular shape, so if it's not in the
   // visual portions of the button we treat it as a click to the caption.
   gfx::Point point_in_newtab_coords(point);
   View::ConvertPointToView(this, newtab_button_, &point_in_newtab_coords);
   if (newtab_button_->bounds().Contains(point) &&
       !newtab_button_->HitTest(point_in_newtab_coords)) {
     return true;
   }
 
@@ skipping 1006 matching lines @@
   // If the TabContents being detached was removed as a result of a drag
   // gesture from its corresponding Tab, we don't want to remove the Tab from
   // the child list, because if we do so it'll stop receiving events and the
   // drag will stall. So we only remove if a drag isn't active, or the Tab
   // was for some other TabContents.
   if (!IsDragSessionActive() || !drag_controller_->IsDragSourceTab(removed)) {
     removed->GetParent()->RemoveChildView(removed);
     delete removed;
   }
 }