Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fix Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index d507d444ca4ec3d6b4076f5f4a7027069db83159..e448ce516bf89cdbdc7ac6b88978cc4cd9a0d4f2 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -800,13 +800,13 @@ void XkbKeyboardLayoutEngine::SetKeymap(xkb_keymap* keymap) {
static const struct {
int ui_flag;
const char* xkb_name;
- } flags[] = {{ui::EF_CONTROL_DOWN, XKB_MOD_NAME_CTRL},
- {ui::EF_SHIFT_DOWN, XKB_MOD_NAME_SHIFT},
+ } flags[] = {{ui::EF_SHIFT_DOWN, XKB_MOD_NAME_SHIFT},
+ {ui::EF_CONTROL_DOWN, XKB_MOD_NAME_CTRL},
{ui::EF_ALT_DOWN, XKB_MOD_NAME_ALT},
- {ui::EF_CAPS_LOCK_DOWN, XKB_MOD_NAME_CAPS},
{ui::EF_COMMAND_DOWN, XKB_MOD_NAME_LOGO},
+ {ui::EF_ALTGR_DOWN, "Mod5"},
{ui::EF_MOD3_DOWN, "Mod3"},
- {ui::EF_ALTGR_DOWN, "Mod5"}};
+ {ui::EF_CAPS_LOCK_ON, XKB_MOD_NAME_CAPS}};
xkb_flag_map_.clear();
xkb_flag_map_.resize(arraysize(flags));
for (size_t i = 0; i < arraysize(flags); ++i) {

Powered by Google App Engine
This is Rietveld 408576698