Wires up registering accelerators from mash with the wm

ash/mus/accelerators/accelerator_controller_registrar.cc

Index: ash/mus/accelerators/accelerator_controller_registrar.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
new file mode 100644
index 0000000000000000000000000000000000000000..999e3f9de86d01d3b5bcf3c4332cb19bf929e5ca
--- /dev/null
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -0,0 +1,166 @@
+// Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_registrar.h"
+
+#include <limits>
+
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_router.h"
+#include "ash/common/wm_shell.h"
+#include "ash/mus/accelerators/accelerator_ids.h"
+#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/window_manager.h"
+#include "base/logging.h"
+#include "services/ui/common/event_matcher_util.h"
+#include "services/ui/public/cpp/window_manager_delegate.h"
+#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/base/accelerators/accelerator_history.h"
+
+namespace ash {
+namespace mus {
+namespace {
+
+// Callback from registering the accelerator. All our accelerators should be
+// registered, so we expect |added| to be true.
+void OnAcceleratorAdded(bool added) {
+  DCHECK(added);
+}
+
+}  // namespace
+
+AcceleratorControllerRegistrar::AcceleratorControllerRegistrar(
+    WindowManager* window_manager,
+    uint16_t id_namespace)
+    : window_manager_(window_manager),
+      id_namespace_(id_namespace),
+      next_id_(0),
+      router_(new AcceleratorRouter) {
+  window_manager_->AddAcceleratorHandler(id_namespace, this);
+}
+
+AcceleratorControllerRegistrar::~AcceleratorControllerRegistrar() {
+  window_manager_->RemoveAcceleratorHandler(id_namespace_);
+
+  if (!window_manager_->window_manager_client())
+    return;
+
+  // TODO(sky): consider not doing this. If we assume the destructor is called
+  // during shutdown, then this is unnecessary and results in a bunch of
+  // messages that are dropped.
+  for (uint16_t local_id : ids_) {
+    window_manager_->window_manager_client()->RemoveAccelerator(
+        ComputeAcceleratorId(id_namespace_, local_id));
+  }
+}
+
+ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
+    uint32_t id,
+    const ui::Event& event) {
+  const ui::Accelerator accelerator(*event.AsKeyEvent());
+  auto iter = accelerator_to_ids_.find(accelerator);
+  if (iter == accelerator_to_ids_.end()) {
+    // Because of timing we may have unregistered the accelerator already,
+    // ignore in that case.
+    return ui::mojom::EventResult::UNHANDLED;
+  }
+
+  const Ids& ids = iter->second;
+  AcceleratorController* accelerator_controller =
+      WmShell::Get()->accelerator_controller();
+  const bool is_pre = GetAcceleratorLocalId(id) == ids.pre_id;
+  if (is_pre) {
+    // TODO(sky): this does not exactly match ash code. In particular ash code
+    // is called for *all* key events, where as this is only called for
+    // registered accelerators. This means the previous accelerator isn't the
+    // same as it was in ash. We need to figure out exactly what is needed of
+    // previous accelerator so that we can either register for the right set of
+    // accelerators, or make WS send the previous accelerator.
+    // http://crbug.com/630683.
+    accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
+        accelerator);
+    WmWindow* target_window = WmShell::Get()->GetFocusedWindow();
+    if (!target_window)
+      target_window = WmShell::Get()->GetRootWindowForNewWindows();
+    DCHECK(target_window);
+    return router_->ProcessAccelerator(target_window, *(event.AsKeyEvent()),
+                                       accelerator)
+               ? ui::mojom::EventResult::HANDLED
+               : ui::mojom::EventResult::UNHANDLED;
+  }
+  DCHECK_EQ(GetAcceleratorLocalId(id), ids.post_id);
+  // NOTE: for post return value doesn't really matter.
+  return WmShell::Get()->accelerator_controller()->Process(accelerator)
+             ? ui::mojom::EventResult::HANDLED
+             : ui::mojom::EventResult::UNHANDLED;
+}
+
+void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
+    const ui::Accelerator& accelerator) {
+  Ids ids;
+  if (!GenerateIds(&ids)) {
+    DVLOG(1) << "max number of accelerators registered, dropping request";
+    return;
+  }
+  DCHECK_EQ(0u, accelerator_to_ids_.count(accelerator));
+  accelerator_to_ids_[accelerator] = ids;
+  DCHECK_EQ(accelerator_to_ids_.size() * 2, ids_.size());
+
+  ui::mojom::EventMatcherPtr event_matcher = ui::CreateKeyMatcher(
+      static_cast<ui::mojom::KeyboardCode>(accelerator.key_code()),
+      accelerator.modifiers());
+  event_matcher->accelerator_phase = ui::mojom::AcceleratorPhase::PRE_TARGET;
+  DCHECK(accelerator.type() == ui::ET_KEY_PRESSED ||
+         accelerator.type() == ui::ET_KEY_RELEASED);
+  event_matcher->type_matcher->type = accelerator.type() == ui::ET_KEY_PRESSED
+                                          ? ui::mojom::EventType::KEY_PRESSED
+                                          : ui::mojom::EventType::KEY_RELEASED;
+
+  ui::mojom::EventMatcherPtr post_event_matcher = event_matcher.Clone();
+  post_event_matcher->accelerator_phase =
+      ui::mojom::AcceleratorPhase::POST_TARGET;
+
+  window_manager_->window_manager_client()->AddAccelerator(
+      ComputeAcceleratorId(id_namespace_, ids.pre_id), std::move(event_matcher),
+      base::Bind(OnAcceleratorAdded));
+  window_manager_->window_manager_client()->AddAccelerator(
+      ComputeAcceleratorId(id_namespace_, ids.post_id),
+      std::move(post_event_matcher), base::Bind(OnAcceleratorAdded));
+}

[sadrul, 2016/07/27 17:20:00]

We install a fair number of accelerators during startup. Should we worry about
the burst of ipcs we would send? Should we consider bundling these into
smaller/a single ipc?

[sky, 2016/07/27 17:39:03]

Definitely. I filed 632050 and 632049 for this.

+
+void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
+    const ui::Accelerator& accelerator) {
+  auto iter = accelerator_to_ids_.find(accelerator);
+  DCHECK(iter != accelerator_to_ids_.end());
+  Ids ids = iter->second;
+  accelerator_to_ids_.erase(iter);
+  ids_.erase(ids.pre_id);
+  ids_.erase(ids.post_id);
+  DCHECK_EQ(accelerator_to_ids_.size() * 2, ids_.size());
+  window_manager_->window_manager_client()->RemoveAccelerator(
+      ComputeAcceleratorId(id_namespace_, ids.pre_id));
+  window_manager_->window_manager_client()->RemoveAccelerator(
+      ComputeAcceleratorId(id_namespace_, ids.post_id));
+}
+
+bool AcceleratorControllerRegistrar::GenerateIds(Ids* ids) {
+  if (ids_.size() + 2 >= std::numeric_limits<uint16_t>::max())
+    return false;
+  ids->pre_id = GetNextLocalAcceleratorId();
+  ids->post_id = GetNextLocalAcceleratorId();
+  return true;
+}
+
+uint16_t AcceleratorControllerRegistrar::GetNextLocalAcceleratorId() {
+  DCHECK(ids_.size() < std::numeric_limits<uint16_t>::max());

[sadrul, 2016/07/27 17:20:00]

DCHECK_LT?

[sky, 2016/07/27 17:39:03]

Done.

+  // Common case is we never wrap once, so this is typically cheap. Additionally
+  // we expect there not to be too many accelerators.
+  while (ids_.count(next_id_) > 0)
+    ++next_id_;
+  ids_.insert(next_id_);
+  return next_id_++;
+}
+
+}  // namespace mus
+}  // namespace ash