Enable keyboard accelerators while a menu is open

ui/views/controls/menu/menu_event_filter.cc

Index: ui/views/controls/menu/menu_event_filter.cc
diff --git a/ui/views/controls/menu/menu_event_filter.cc b/ui/views/controls/menu/menu_event_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..569d0c2894e19e49d80a65523da225bab1883ab9
--- /dev/null
+++ b/ui/views/controls/menu/menu_event_filter.cc
@@ -0,0 +1,152 @@
+// Copyright 2015 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/views/controls/menu/menu_event_filter.h"
+
+#include "ui/aura/window.h"
+#include "ui/aura/window_property.h"
+#include "ui/base/accelerators/accelerator.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
+#include "ui/views/controls/menu/menu_controller.h"
+
+DECLARE_WINDOW_PROPERTY_TYPE(views::MenuEventFilter::Delegate*);
+
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(views::MenuEventFilter::Delegate*,
+                                 kMenuEventFilterDelegateKey,
+                                 nullptr);
+
+namespace views {
+
+namespace {
+
+const int kKeyFlagsMask = ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN;
+
+// Defines a NULL-Object delegate for non-ash platforms.

[pkotwicz, 2015/08/28 22:10:10]

How about: "No-op delegate."

[afakhry, 2015/08/28 23:32:12]

Done.

+class DefaultMenuDelegate : public MenuEventFilter::Delegate {
+ public:
+  DefaultMenuDelegate() {}
+  ~DefaultMenuDelegate() override {}
+
+  // MenuEventFilter::Delegate:
+  void StoreInHistory(const ui::Accelerator& accelerator) override {}
+  bool ShouldCloseMenuAndRepostAccelerator(
+      const ui::Accelerator& accelerator) const override {
+    return false;
+  }
+  void ProcessAcceleratorNow(const ui::Accelerator& accelerator) override {
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DefaultMenuDelegate);
+};
+
+// Reposts the |accelerator| to be processed later.
+void RepostAccelerator(const ui::Accelerator& accelerator,
+                       MenuEventFilter::Delegate* delegate) {
+  base::MessageLoopForUI::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&MenuEventFilter::Delegate::ProcessAcceleratorNow,
+                 base::Unretained(delegate),
+                 accelerator));
+}
+
+}  // namespace
+
+MenuEventFilter::MenuEventFilter(MenuController* menu_controller,
+                                 MenuEventFilter::Delegate* delegate)
+    : menu_controller_(menu_controller),
+      default_delegate_(new DefaultMenuDelegate),
+      filter_delegate_(delegate) {
+  DCHECK(menu_controller_);
+}
+
+MenuEventFilter::~MenuEventFilter() {
+}
+
+// static
+void MenuEventFilter::SetMenuEventFilterDelegate(
+    aura::Window* root_window,
+    MenuEventFilter::Delegate* delegate) {
+  DCHECK(root_window);

[pkotwicz, 2015/08/28 23:44:25]

This DCHECK is unnecessary. Line 74 will crash if |root_window| is a nullptr

[afakhry, 2015/08/29 01:31:23]

DCHECK()'s never hurt. It's better to crash on a DCHECK() than get a useless
segmentation fault. However, I removed it.

+  DCHECK(delegate);
+  DCHECK_EQ(root_window->GetRootWindow(), root_window);
+  root_window->SetProperty(kMenuEventFilterDelegateKey, delegate);
+}
+
+// static
+MenuEventFilter::Delegate* MenuEventFilter::GetMenuEventFilterDelegate(
+    aura::Window* root_window) {
+  DCHECK(root_window);
+  DCHECK_EQ(root_window->GetRootWindow(), root_window);
+  return root_window->GetProperty(kMenuEventFilterDelegateKey);
+}
+
+void MenuEventFilter::OnKeyEvent(ui::KeyEvent* event) {
+  DCHECK(event);

[pkotwicz, 2015/08/28 23:44:25]

Nit: This DCHECK() is unnecessary. This method will crash if |event| is null

[afakhry, 2015/08/29 01:31:24]

Same reason as above. However removed.

+
+  MenuEventFilter::Delegate* delegate =
+      filter_delegate_ ? filter_delegate_ : default_delegate_.get();
+  DCHECK(delegate);

[pkotwicz, 2015/08/28 22:10:10]

This DCHECK is unnecessary

[afakhry, 2015/08/28 23:32:12]

Done.

+
+  // First record the current accelerator (this is normally done by the
+  // AcceleratorFilter, but since the MenuEventFilter will precede the
+  // AcceleratorFilter in the pre-target handlers list, we have to do it here).
+  ui::Accelerator accelerator(*event);
+  delegate->StoreInHistory(accelerator);

[pkotwicz, 2015/08/28 23:44:25]

Shouldn't we do this only in the case where we call ui::Event::StopPropagation()
?

I think the comment should say that we do this because we stop propagation and
wm::AcceleratorFilter::OnKeyEvent() will not get the event.

[afakhry, 2015/08/29 01:31:24]

Done.

+
+  CHECK(menu_controller_);

[pkotwicz, 2015/08/28 23:44:25]

Nit: Remove this CHECK(). You already have the DCHECK() in the constructor

[afakhry, 2015/08/29 01:31:24]

Done.

+
+  bool should_close_and_repost_accelerator = false;
+
+  if (menu_controller_->exit_type() == MenuController::EXIT_ALL ||
+      menu_controller_->exit_type() == MenuController::EXIT_DESTROYED) {
+    // If the event has arrived after the menu's exit type had changed but
+    // before its message loop terminated, the event will continue its normal
+    // propagation.
+    menu_controller_->TerminateNestedMessageLoop();
+    return;
+  } else {
+    if (event->type() == ui::ET_KEY_PRESSED) {
+      menu_controller_->OnKeyDown(event->key_code());
+
+      const int flags = event->flags();
+      if (menu_controller_->exit_type() == MenuController::EXIT_NONE &&
+          (flags & kKeyFlagsMask) == 0) {
+        // Only check mnemonics if the menu hasn't exited as a result from
+        // MenuController::OnKeyDown() and no modifiers are pressed.

[pkotwicz, 2015/08/28 23:44:25]

Nit: Remove the comment. It does not say anything that isn't obvious from the
code.

[afakhry, 2015/08/29 01:31:24]

Done.

+        char c = ui::GetCharacterFromKeyCode(event->key_code(), flags);
+        menu_controller_->SelectByChar(c);
+      }
+    }
+  }
+
+  if (menu_controller_->exit_type() == MenuController::EXIT_NONE) {
+    should_close_and_repost_accelerator =
+        delegate->ShouldCloseMenuAndRepostAccelerator(accelerator);
+  } else {
+    menu_controller_->TerminateNestedMessageLoop();
+  }
+
+  // The event's propagation will always be stopped.

[pkotwicz, 2015/08/28 23:44:25]

Nit: This comment is no longer accurate

[afakhry, 2015/08/29 01:31:24]

Done.

+  event->StopPropagation();
+
+  if (should_close_and_repost_accelerator) {
+    menu_controller_->CancelAll();
+    RepostAccelerator(accelerator, delegate);
+  } else {
+    delegate->ProcessAcceleratorNow(accelerator);
+  }
+}
+
+void MenuEventFilter::OnTouchEvent(ui::TouchEvent* event) {
+  if (event->type() == ui::ET_TOUCH_RELEASED ||
+      event->type() == ui::ET_TOUCH_CANCELLED) {
+    // Don't allow the event copy to clear the native touch id
+    // mapping, or we'll lose the mapping before the initial event
+    // has finished being dispatched.
+    event->set_should_remove_native_touch_id_mapping(false);
+  }
+}
+
+}  // namespace views