Context menu on views must show on mouse dpwn for non-WIN.

ui/views/view.cc

 // Copyright (c) 2012 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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 39 matching lines @@
 namespace {
 
 // Whether to use accelerated compositing when necessary (e.g. when a view has a
 // transformation).
 #if defined(USE_AURA)
 bool use_acceleration_when_possible = true;
 #else
 bool use_acceleration_when_possible = false;
 #endif
 
+#if defined(OS_WIN)
+bool context_menu_on_mouse_press = false;

[sadrul, 2013/03/05 16:30:11]

this value never changes, right? It should be 'const bool
kContextMenuOnMousePress'

[varunjain, 2013/03/05 21:14:21]

Done.

+#else
+bool context_menu_on_mouse_press = true;
+#endif
+
 // Saves the drawing state, and restores the state when going out of scope.
 class ScopedCanvas {
  public:
   explicit ScopedCanvas(gfx::Canvas* canvas) : canvas_(canvas) {
     if (canvas_)
       canvas_->Save();
   }
   ~ScopedCanvas() {
     if (canvas_)
       canvas_->Restore();
@@ skipping 1963 matching lines @@
 
 bool View::ProcessMousePressed(const ui::MouseEvent& event) {
   int drag_operations =
       (enabled_ && event.IsOnlyLeftMouseButton() &&
        HitTestPoint(event.location())) ?
        GetDragOperations(event.location()) : 0;
   ContextMenuController* context_menu_controller = event.IsRightMouseButton() ?
       context_menu_controller_ : 0;
 
   const bool enabled = enabled_;
-  const bool result = OnMousePressed(event);
-  // WARNING: we may have been deleted, don't use any View variables.
+
+  bool result = false;
+  if (enabled_ && context_menu_controller_ && event.IsOnlyRightMouseButton() &&
+      context_menu_on_mouse_press) {
+    // Assume that if there is a context menu controller we won't be deleted
+    // from mouse pressed.
+    gfx::Point location(event.location());
+    result = OnMousePressed(event);
+    if (HitTestPoint(location)) {
+      ConvertPointToScreen(this, &location);
+      ShowContextMenu(location, true);
+      return true;
+    }
+  } else {
+    result = OnMousePressed(event);
+    // WARNING: we may have been deleted, don't use any View variables.
+  }
 
   if (!enabled)
     return result;
 
   if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
     GetDragInfo()->PossibleDrag(event.location());
     return true;
   }
   return !!context_menu_controller || result;
 }
@@ skipping 14 matching lines @@
   } else {
     if (OnMouseDragged(event))
       return true;
     // Fall through to return value based on context menu controller.
   }
   // WARNING: we may have been deleted.
   return (context_menu_controller != NULL) || possible_drag;
 }
 
 void View::ProcessMouseReleased(const ui::MouseEvent& event) {
-  if (context_menu_controller_ && event.IsOnlyRightMouseButton()) {
+  if (!context_menu_on_mouse_press && context_menu_controller_ &&
+      event.IsOnlyRightMouseButton()) {
     // Assume that if there is a context menu controller we won't be deleted
     // from mouse released.
     gfx::Point location(event.location());
     OnMouseReleased(event);
     if (HitTestPoint(location)) {
       ConvertPointToScreen(this, &location);
       ShowContextMenu(location, true);
     }
   } else {
     OnMouseReleased(event);
@@ skipping 140 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views