Relanding in-progress download bug fix

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 886 matching lines @@
     TabContents* contents = model_->GetTabContentsAt(tab_index);
     if (contents)
       UserMetrics::RecordAction(L"CloseTab_Mouse", contents->profile());
     Tab* last_tab = GetTabAt(GetTabCount() - 1);
     // Limit the width available to the TabStrip for laying out Tabs, so that
     // Tabs are not resized until a later time (when the mouse pointer leaves
     // the TabStrip).
     available_width_for_tabs_ = GetAvailableWidthForTabs(last_tab);
     resize_layout_scheduled_ = true;
     AddMessageLoopObserver();
+    // Note that the next call might not close the tab (because of unload
+    // hanlders or if the delegate veto the close).
     model_->CloseTabContentsAt(tab_index);
   }
 }
 
 bool TabStrip::IsCommandEnabledForTab(
     TabStripModel::ContextMenuCommand command_id, const Tab* tab) const {
   int index = GetIndexOfTab(tab);
   if (model_->ContainsIndex(index))
     return model_->IsContextMenuCommandEnabled(index, command_id);
   return false;
@@ skipping 602 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;
   }
 }