Issue 21268: The Remake...

chrome/views/view.cc

 // Copyright (c) 2006-2008 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 "chrome/views/view.h"
 
 #include <algorithm>
 
 #ifndef NDEBUG
 #include <iostream>
@@ skipping 444 matching lines @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
 bool View::ProcessMousePressed(const MouseEvent& e, DragInfo* drag_info) {
   const bool enabled = enabled_;
   int drag_operations;
   if (enabled && e.IsOnlyLeftMouseButton() && HitTest(e.location()))
     drag_operations = GetDragOperations(e.x(), e.y());
   else
     drag_operations = 0;
-  ContextMenuController* context_menu_controller = context_menu_controller_;
+  ContextMenuController* context_menu_controller =
+      e.IsRightMouseButton() ? context_menu_controller_ : 0;
 
   const bool result = OnMousePressed(e);
   // WARNING: we may have been deleted, don't use any View variables;
 
   if (!enabled)
     return result;
 
   if (drag_operations != DragDropTypes::DRAG_NONE) {
     drag_info->PossibleDrag(e.x(), e.y());
     return true;
@@ skipping 1152 matching lines @@
   start_x = start_y = 0;
 }
 
 void View::DragInfo::PossibleDrag(int x, int y) {
   possible_drag = true;
   start_x = x;
   start_y = y;
 }
 
 }  // namespace