Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/menu/menu_host_root_view.cc

Index: views/controls/menu/menu_host_root_view.cc
diff --git a/views/controls/menu/menu_host_root_view.cc b/views/controls/menu/menu_host_root_view.cc
index bf2a997443e0efee0e03b77cbb7145da08971037..45a55c6d940cbf82a19a3333209c49f16d9f5104 100644
--- a/views/controls/menu/menu_host_root_view.cc
+++ b/views/controls/menu/menu_host_root_view.cc
@@ -41,19 +41,25 @@ bool MenuHostRootView::OnMouseDragged(const MouseEvent& event) {
   return RootView::OnMouseDragged(event);
 }
 
-void MenuHostRootView::OnMouseReleased(const MouseEvent& event,
-                                       bool canceled) {
+void MenuHostRootView::OnMouseReleased(const MouseEvent& event) {
   if (suspend_events_)
     return;
 
-  RootView::OnMouseReleased(event, canceled);
+  RootView::OnMouseReleased(event);
   if (forward_drag_to_menu_controller_ && GetMenuController()) {
     forward_drag_to_menu_controller_ = false;
-    if (canceled) {
-      GetMenuController()->Cancel(MenuController::EXIT_ALL);
-    } else {
-      GetMenuController()->OnMouseReleased(submenu_, event);
-    }
+    GetMenuController()->OnMouseReleased(submenu_, event);
+  }
+}
+
+void MenuHostRootView::OnMouseCaptureLost() {
+  if (suspend_events_)
+    return;
+
+  RootView::OnMouseCaptureLost();

[Ben Goodger (Google), 2011/03/19 15:32:55]

Again with the duplication

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

It turns out that this canceled code path was causing inadvertent menu closures
on mouse drag starts (now that WidgetWin directly calls this OnMouseCaptureLost,
rather than bailing at RootView::ProcessMouseDragCanceled's
mouse_pressed_handler_ check). Removing this path doesn't seem to affect menu
behavior adversely. I also removed the unused suspend_events flag and the
unnecessary OnMouseExited override.

+  if (forward_drag_to_menu_controller_ && GetMenuController()) {
+    forward_drag_to_menu_controller_ = false;
+    GetMenuController()->Cancel(MenuController::EXIT_ALL);
   }
 }