summaryrefslogtreecommitdiffstats
path: root/ui/base/win/events_win.cc
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 21:41:07 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 21:41:07 +0000
commitf8d74230b839def072f26049845bd9003d87eb26 (patch)
tree7d5ecb668377162dab0260e7fe107018115b904e /ui/base/win/events_win.cc
parent2212d27f2cc41983901f45299cda82d704c76e82 (diff)
downloadchromium_src-f8d74230b839def072f26049845bd9003d87eb26.zip
chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.gz
chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.bz2
Rename ui::EventFlags mouse flags to be more sensible
Changes EF_(LEFT|MIDDLE|RIGHT)_BUTTON_DOWN to EF_(LEF|MIDDLE|RIGHT)_MOUSE_BUTTON since these are not specific to "down" button events. This is follow up from review http://codereview.chromium.org/8953037 BUG=none TEST=Compiles. R=ben@chromium.org Review URL: http://codereview.chromium.org/9007016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/win/events_win.cc')
-rw-r--r--ui/base/win/events_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index c745526..924c82e 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -126,9 +126,9 @@ int MouseStateFlagsFromNative(const base::NativeEvent& native_event) {
win_flags |= GET_KEYSTATE_WPARAM(native_event.wParam);
int flags = 0;
- flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_BUTTON_DOWN : 0;
- flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
- flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+ flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_MOUSE_BUTTON : 0;
+ flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
+ flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
flags |= IsDoubleClickMouseEvent(native_event) ? ui::EF_IS_DOUBLE_CLICK: 0;
flags |= IsNonClientMouseEvent(native_event) ? ui::EF_IS_NON_CLIENT : 0;
return flags;