Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/menu/menu_host_root_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 "views/controls/menu/menu_host_root_view.h"
 
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
@@ skipping 23 matching lines @@
   if (suspend_events_)
     return true;
 
   if (forward_drag_to_menu_controller_ && GetMenuController()) {
     GetMenuController()->OnMouseDragged(submenu_, event);
     return true;
   }
   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);
+  }
+}
+
 void MenuHostRootView::OnMouseMoved(const MouseEvent& event) {
   if (suspend_events_)
     return;
 
   RootView::OnMouseMoved(event);
   if (GetMenuController())
     GetMenuController()->OnMouseMoved(submenu_, event);
 }
 
 void MenuHostRootView::OnMouseExited(const MouseEvent& event) {
   if (suspend_events_)
     return;
 
   RootView::OnMouseExited(event);
 }
 
 bool MenuHostRootView::OnMouseWheel(const MouseWheelEvent& event) {
   // RootView::OnMouseWheel forwards to the focused view. We don't have a
   // focused view, so we need to override this then forward to the menu.
   return submenu_->OnMouseWheel(event);
 }
 
 MenuController* MenuHostRootView::GetMenuController() {
   return submenu_->GetMenuItem()->GetMenuController();
 }
 
 }  // namespace views