summaryrefslogtreecommitdiffstats
path: root/views/controls/button/menu_button.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 23:34:07 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 23:34:07 +0000
commite9adf0702e30800cdfaebce8cfacff7b444b4e79 (patch)
tree49d8ab8fa6e0090c6dd7bbe667008f07e5939af0 /views/controls/button/menu_button.cc
parentae5f56fed71e801889db8f0f7ebd2f21d6612521 (diff)
downloadchromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.zip
chromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.tar.gz
chromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.tar.bz2
Replace lots of "int x, int y" with gfx::Point. Also use gfx::Size and gfx::Rect in a few more places.
BUG=none TEST=none Review URL: http://codereview.chromium.org/669130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/menu_button.cc')
-rw-r--r--views/controls/button/menu_button.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index c3e8522..4c9f0fe 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -172,7 +172,7 @@ bool MenuButton::OnMousePressed(const MouseEvent& e) {
// If we're draggable (GetDragOperations returns a non-zero value), then
// don't pop on press, instead wait for release.
if (e.IsOnlyLeftMouseButton() && HitTest(e.location()) &&
- GetDragOperations(e.x(), e.y()) == DragDropTypes::DRAG_NONE) {
+ GetDragOperations(e.location()) == DragDropTypes::DRAG_NONE) {
TimeDelta delta = Time::Now() - menu_closed_time_;
int64 delta_in_milliseconds = delta.InMilliseconds();
if (delta_in_milliseconds > kMinimumTimeBetweenButtonClicks) {
@@ -189,7 +189,7 @@ void MenuButton::OnMouseReleased(const MouseEvent& e,
// !IsTriggerableEvent it could lead to a situation where we end up showing
// the menu and context menu (this would happen if the right button is not
// triggerable and there's a context menu).
- if (GetDragOperations(e.x(), e.y()) != DragDropTypes::DRAG_NONE &&
+ if (GetDragOperations(e.location()) != DragDropTypes::DRAG_NONE &&
state() != BS_DISABLED && !canceled && !InDrag() &&
e.IsOnlyLeftMouseButton() && HitTest(e.location())) {
Activate();