Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
index cf15425c7e5acb93b733d7284a479c715de4800a..5a76cbf7a46d40f643ddfd092cd7e9c5a9155bc5 100644 |
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc |
@@ -101,6 +101,12 @@ int XGetModifiers() { |
modifiers |= ui::EF_ALT_DOWN; |
if (mask & Mod4Mask) |
modifiers |= ui::EF_COMMAND_DOWN; |
+ if (mask & Button1Mask) |
+ modifiers |= ui::EF_LEFT_MOUSE_BUTTON; |
+ if (mask & Button2Mask) |
+ modifiers |= ui::EF_MIDDLE_MOUSE_BUTTON; |
+ if (mask & Button3Mask) |
+ modifiers |= ui::EF_RIGHT_MOUSE_BUTTON; |
return modifiers; |
} |
@@ -764,7 +770,10 @@ void DesktopDragDropClientAuraX11::OnMouseMovement( |
} |
const int kModifiers = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | |
- ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN; |
+ ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN | |
+ ui::EF_LEFT_MOUSE_BUTTON | |
+ ui::EF_MIDDLE_MOUSE_BUTTON | |
+ ui::EF_RIGHT_MOUSE_BUTTON; |
current_modifier_state_ = flags & kModifiers; |
repeat_mouse_move_timer_.Stop(); |