summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 20:25:44 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 20:25:44 +0000
commit464fdb3e6c72c3a0ddc546c0f2b9607b087997a2 (patch)
tree12cfe0fbf35140d9f6949bcacf4be0c15c503b61 /chrome/views
parent99a713a024644d5dbcdd597cdb60dc54c781f79c (diff)
downloadchromium_src-464fdb3e6c72c3a0ddc546c0f2b9607b087997a2.zip
chromium_src-464fdb3e6c72c3a0ddc546c0f2b9607b087997a2.tar.gz
chromium_src-464fdb3e6c72c3a0ddc546c0f2b9607b087997a2.tar.bz2
Lands http://codereview.chromium.org/43009 .
BUG=7259 TEST=see bug git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/view.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index 15af28f..8ec349b 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -499,9 +499,11 @@ void View::ProcessMouseReleased(const MouseEvent& e, bool canceled) {
// Assume that if there is a context menu controller we won't be deleted
// from mouse released.
gfx::Point location(e.location());
- ConvertPointToScreen(this, &location);
OnMouseReleased(e, canceled);
- ShowContextMenu(location.x(), location.y(), true);
+ if (HitTest(location)) {
+ ConvertPointToScreen(this, &location);
+ ShowContextMenu(location.x(), location.y(), true);
+ }
} else {
OnMouseReleased(e, canceled);
}