Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

chrome/browser/ui/views/download_item_view.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/download_item_view.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_path.h"
@@ skipping 514 matching lines @@
       }
     }
   } else if (ExceededDragThreshold(
                  event.location().x() - drag_start_point_.x(),
                  event.location().y() - drag_start_point_.y())) {
     dragging_ = true;
   }
   return true;
 }
 
-void DownloadItemView::OnMouseReleased(const views::MouseEvent& event,
-                                       bool canceled) {
+void DownloadItemView::OnMouseReleased(const views::MouseEvent& event) {
   // Mouse should not activate us in dangerous mode.
   if (IsDangerousMode())
     return;
 
   if (dragging_) {
     // Starting a drag results in a MouseReleased, we need to ignore it.
     dragging_ = false;
     starting_drag_ = false;
     return;
   }
   if (event.IsOnlyLeftMouseButton() &&
       !InDropDownButtonXCoordinateRange(event.x())) {
     OpenDownload();
   }
 
   SetState(NORMAL, NORMAL);
 }
 
+void DownloadItemView::OnMouseCaptureLost() {
+  // Mouse should not activate us in dangerous mode.
+  if (IsDangerousMode())
+    return;
+
+  if (dragging_) {
+    // Starting a drag results in a MouseReleased, we need to ignore it.
+    dragging_ = false;
+    starting_drag_ = false;
+    return;
+  }
+

[sadrul, 2011/03/19 09:15:30]

Code duplication like this needs to be avoided. See note on
render_widget_host_view_views.cc about this.

[msw, 2011/03/26 00:09:50]

Done. In this instance, the |dragging_| block wasn't needed in OnMouseReleased.

+  SetState(NORMAL, NORMAL);
+}
+
 void DownloadItemView::OnMouseMoved(const views::MouseEvent& event) {
   // Mouse should not activate us in dangerous mode.
   if (IsDangerousMode())
     return;
 
   bool on_body = !InDropDownButtonXCoordinateRange(event.x());
   SetState(on_body ? HOT : NORMAL, on_body ? NORMAL : HOT);
   if (on_body) {
     body_hover_animation_->Show();
     drop_hover_animation_->Hide();
@@ skipping 525 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }