summaryrefslogtreecommitdiffstats
path: root/ui/base/win
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 01:27:33 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 01:27:33 +0000
commit07d294fbdd4efb893929386dadbec71b7ca7429a (patch)
treed1af46a7c8966f116ca292d10f636fe0518f6cb0 /ui/base/win
parentd79c13b4be9fe89b1f81bdde8ed0257b2ca6e4e0 (diff)
downloadchromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.zip
chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.gz
chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.bz2
Pass event bitmask (shift, control, alt) to ui::Accelerator instead of booleans.
BUG=128242 R=ben@chromium.org TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10399044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/win')
-rw-r--r--ui/base/win/events_win.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index 9f75b6f..a014ce0 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -300,4 +300,15 @@ base::NativeEvent CreateNoopEvent() {
return event;
}
+int GetModifiersFromACCEL(const ACCEL& accel) {
+ int modifiers = ui::EF_NONE;
+ if (accel.fVirt & FSHIFT)
+ modifiers |= ui::EF_SHIFT_DOWN;
+ if (accel.fVirt & FCONTROL)
+ modifiers |= ui::EF_CONTROL_DOWN;
+ if (accel.fVirt & FALT)
+ modifiers |= ui::EF_ALT_DOWN;
+ return modifiers;
+}
+
} // namespace ui