Converting (Alt+LeftClick -> RightClick) to (Search+LeftClick -> RightClick)

ui/wm/core/accelerator_filter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/accelerator_filter.h"
 
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_history.h"
 #include "ui/events/event.h"
 #include "ui/wm/core/accelerator_delegate.h"
@@ skipping 53 matching lines @@
   accelerator_history_->StoreCurrentAccelerator(accelerator);
 
   AcceleratorDelegate::KeyType key_type =
       IsSystemKey(event->key_code()) ? AcceleratorDelegate::KEY_TYPE_SYSTEM
                                      : AcceleratorDelegate::KEY_TYPE_OTHER;
 
   if (delegate_->ProcessAccelerator(*event, accelerator, key_type))
     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 for this?

It is possible that some synthesized mouse event is generated in response to
some accelerator (e.g. if a new window is created under the mouse-cursor, or the
window under the cursor goes away). Would that cause any issues?

[afakhry, 2015/05/02 00:02:42]

I don't this will create any issues. There are only two accelerators in the
AcceleratorController::CanPerformAction() for which we need to check the
previous accelerator, namely toggle applist and next IME. I tested both with
this change and they're working fine.

But as an extra care, in the second patch I'm ignoring synthesized mouse events.

I also added a test that fails without this code in
|accelerator_filter_unittest.cc|

+  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);
 
   ui::Accelerator accelerator(key_event.key_code(),
                               key_event.flags() & kModifierFlagMask);
   if (key_event.type() == ui::ET_KEY_RELEASED)
     accelerator.set_type(ui::ET_KEY_RELEASED);
   accelerator.set_is_repeat(key_event.IsRepeat());
   return accelerator;
 }
 
 }  // namespace wm