Moves accelerator registration to WindowManager

components/mus/ws/window_tree_impl.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 "components/mus/ws/window_tree_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 298 matching lines @@
   window_id_to_client_id_map_[window->id()] =
       waiting_for_top_level_window_info->client_window_id;
   roots_.insert(window);
   client_->OnTopLevelCreated(client_change_id, WindowToWindowData(window));
 }
 
 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,
                                                 bool originated_change) {
   ClientWindowId client_window_id;
   if (originated_change || !IsWindowKnown(window, &client_window_id))
     return;
   client_->OnWindowBoundsChanged(client_window_id.id, Rect::From(old_bounds),
                                  Rect::From(new_bounds));
 }
@@ skipping 857 matching lines @@
     mojo::AssociatedInterfaceRequest<mojom::WindowManagerClient> internal) {
   if (!access_policy_->CanSetWindowManager() || !window_manager_internal_ ||
       window_manager_internal_client_binding_) {
     return;
   }
   window_manager_internal_client_binding_.reset(
       new mojo::AssociatedBinding<mojom::WindowManagerClient>(
           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())
     connection_manager_->WindowManagerChangeCompleted(change_id, response);
 }
 
 void WindowTreeImpl::WmRequestClose(Id transport_window_id) {
   // Only the WindowManager should be using this.
   WindowTreeHostImpl* host = GetHostForWindowManager();
   if (!host)
@@ skipping 52 matching lines @@
 
   for (const auto* root : roots_) {
     if (root->Contains(window))
       return true;
   }
   return false;
 }
 
 }  // namespace ws
 }  // namespace mus