Index: ui/wm/core/accelerator_filter.cc |
diff --git a/ui/wm/core/accelerator_filter.cc b/ui/wm/core/accelerator_filter.cc |
index 12e91316d21ce81ce0c8906c851bf13f24cedf83..3661fc529d8d538271f11c988d995968c7b540cc 100644 |
--- a/ui/wm/core/accelerator_filter.cc |
+++ b/ui/wm/core/accelerator_filter.cc |
@@ -71,6 +71,13 @@ void AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) { |
event->StopPropagation(); |
} |
+void AcceleratorFilter::OnMouseEvent(ui::MouseEvent* event) { |
+ // When a mouse event is interleaved between two key accelerators, we must |
+ // clear the current accelerator in the accelerator history by setting it to |
+ // a default empty key accelerator. |
sadrul
2015/05/01 03:21:18
Interesting! Would it be possible to write a test
afakhry
2015/05/02 00:02:42
I don't this will create any issues. There are onl
|
+ accelerator_history_->StoreCurrentAccelerator(ui::Accelerator()); |
+} |
+ |
ui::Accelerator CreateAcceleratorFromKeyEvent(const ui::KeyEvent& key_event) { |
const int kModifierFlagMask = |
(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN); |