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

trunk/src/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)
-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:
   explicit ScopedCanvas(gfx::Canvas* canvas) : canvas_(canvas) {
     if (canvas_)
       canvas_->Save();
   }
   ~ScopedCanvas() {
     if (canvas_)
       canvas_->Restore();
@@ skipping 1053 matching lines @@
 
 // Context menus ---------------------------------------------------------------
 
 void View::ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture) {
   if (!context_menu_controller_)
     return;
 
   context_menu_controller_->ShowContextMenuForView(this, p);
 }
 
-// static
-bool View::ShouldShowContextMenuOnMousePress() {
-  return kContextMenuOnMousePress;
-}
-
 // Drag and drop ---------------------------------------------------------------
 
 bool View::GetDropFormats(
       int* formats,
       std::set<OSExchangeData::CustomFormat>* custom_formats) {
   return false;
 }
 
 bool View::AreDropTypesRequired() {
   return false;
@@ skipping 910 matching lines @@
 
 // Input -----------------------------------------------------------------------
 
 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;
-  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;
 }
 
 bool View::ProcessMouseDragged(const ui::MouseEvent& event) {
   // Copy the field, that way if we're deleted after drag and drop no harm is
   // done.
   ContextMenuController* context_menu_controller = context_menu_controller_;
   const bool possible_drag = GetDragInfo()->possible_drag;
   if (possible_drag &&
       ExceededDragThreshold(GetDragInfo()->start_pt - event.location())) {
     if (!drag_controller_ ||
         drag_controller_->CanStartDragForView(
             this, GetDragInfo()->start_pt, event.location())) {
       DoDrag(event, GetDragInfo()->start_pt,
           ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
     }
   } 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 (!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());
     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