Moves accelerator registration to WindowManager

components/mus/ws/window_tree_impl.cc

Index: components/mus/ws/window_tree_impl.cc
diff --git a/components/mus/ws/window_tree_impl.cc b/components/mus/ws/window_tree_impl.cc
index f9d145bfcbcde4ae756d28c4222967dc89842e70..ecb9029514ba95dff668ade53c08d77cc727a3ff 100644
--- a/components/mus/ws/window_tree_impl.cc
+++ b/components/mus/ws/window_tree_impl.cc
@@ -316,6 +316,12 @@ void WindowTreeImpl::OnChangeCompleted(uint32_t change_id, bool success) {
   client_->OnChangeCompleted(change_id, success);
 }
 
+void WindowTreeImpl::OnAccelerator(uint32_t accelerator_id,
+                                   mojom::EventPtr event) {
+  DCHECK(window_manager_internal_);
+  window_manager_internal_->OnAccelerator(accelerator_id, std::move(event));
+}
+
 void WindowTreeImpl::ProcessWindowBoundsChanged(const ServerWindow* window,
                                                 const gfx::Rect& old_bounds,
                                                 const gfx::Rect& new_bounds,
@@ -1193,6 +1199,23 @@ void WindowTreeImpl::GetWindowManagerClient(
           this, std::move(internal)));
 }
 
+void WindowTreeImpl::AddAccelerator(uint32_t id,
+                                    mojom::EventMatcherPtr event_matcher,
+                                    const AddAcceleratorCallback& callback) {
+  WindowTreeHostImpl* host = GetHostForWindowManager();
+  const bool success =
+      host &&
+      host->event_dispatcher()->AddAccelerator(id, std::move(event_matcher));
+  callback.Run(success);
+}
+
+void WindowTreeImpl::RemoveAccelerator(uint32_t id) {
+  WindowTreeHostImpl* host = GetHostForWindowManager();
+  if (!host)
+    return;
+  host->event_dispatcher()->RemoveAccelerator(id);
+}
+
 void WindowTreeImpl::WmResponse(uint32_t change_id, bool response) {
   // TODO(sky): think about what else case means.
   if (GetHostForWindowManager())