Revert 192525 "Context menu on views must show on mouse down for..."

trunk/src/ui/views/view.cc

Index: trunk/src/ui/views/view.cc
===================================================================
--- trunk/src/ui/views/view.cc	(revision 192531)
+++ trunk/src/ui/views/view.cc	(working copy)
@@ -57,12 +57,6 @@
 bool use_acceleration_when_possible = false;
 #endif
 
-#if defined(OS_WIN)
-const bool kContextMenuOnMousePress = false;
-#else
-const bool kContextMenuOnMousePress = true;
-#endif
-
 // Saves the drawing state, and restores the state when going out of scope.
 class ScopedCanvas {
  public:
@@ -1136,11 +1130,6 @@
   context_menu_controller_->ShowContextMenuForView(this, p);
 }
 
-// static
-bool View::ShouldShowContextMenuOnMousePress() {
-  return kContextMenuOnMousePress;
-}
-
 // Drag and drop ---------------------------------------------------------------
 
 bool View::GetDropFormats(
@@ -2071,29 +2060,16 @@
        GetDragOperations(event.location()) : 0;
   ContextMenuController* context_menu_controller = event.IsRightMouseButton() ?
       context_menu_controller_ : 0;
-  View::DragInfo* drag_info = GetDragInfo();
 
   const bool enabled = enabled_;
   const bool result = OnMousePressed(event);
+  // WARNING: we may have been deleted, don't use any View variables.
 
   if (!enabled)
     return result;
 
-  if (event.IsOnlyRightMouseButton() && context_menu_controller &&
-      kContextMenuOnMousePress) {
-    // Assume that if there is a context menu controller we won't be deleted
-    // from mouse pressed.
-    gfx::Point location(event.location());
-    if (HitTestPoint(location)) {
-      ConvertPointToScreen(this, &location);
-      ShowContextMenu(location, true);
-      return true;
-    }
-  }
-
-  // WARNING: we may have been deleted, don't use any View variables.
   if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
-    drag_info->PossibleDrag(event.location());
+    GetDragInfo()->PossibleDrag(event.location());
     return true;
   }
   return !!context_menu_controller || result;
@@ -2122,8 +2098,7 @@
 }
 
 void View::ProcessMouseReleased(const ui::MouseEvent& event) {
-  if (!kContextMenuOnMousePress && context_menu_controller_ &&
-      event.IsOnlyRightMouseButton()) {
+  if (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());