Moves accelerator registration to WindowManager

components/mus/ws/window_tree_host_impl.cc

 // 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 "components/mus/ws/window_tree_host_impl.h"
 
 #include "base/debug/debugger.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
@@ skipping 216 matching lines @@
 }
 
 void WindowTreeHostImpl::SetSize(mojo::SizePtr size) {
   display_manager_->SetViewportSize(size.To<gfx::Size>());
 }
 
 void WindowTreeHostImpl::SetTitle(const mojo::String& title) {
   display_manager_->SetTitle(title.To<base::string16>());
 }
 
-void WindowTreeHostImpl::AddAccelerator(
-    uint32_t id,
-    mojom::EventMatcherPtr event_matcher,
-    const AddAcceleratorCallback& callback) {
-  bool success = event_dispatcher_.AddAccelerator(id, std::move(event_matcher));
-  callback.Run(success);
-}
-
-void WindowTreeHostImpl::RemoveAccelerator(uint32_t id) {
-  event_dispatcher_.RemoveAccelerator(id);
-}
-
 void WindowTreeHostImpl::AddActivationParent(Id transport_window_id) {
   ServerWindow* window = GetWindowFromWindowTreeHost(transport_window_id);
   if (window)
     activation_parents_.insert(window->id());
 }
 
 void WindowTreeHostImpl::RemoveActivationParent(Id transport_window_id) {
   ServerWindow* window = GetWindowFromWindowTreeHost(transport_window_id);
   if (window)
     activation_parents_.erase(window->id());
@@ skipping 252 matching lines @@
       root_tree != embedded_connection_new) {
     root_tree->ProcessFocusChanged(old_focused_window, new_focused_window);
   }
 
   UpdateTextInputState(new_focused_window,
                        new_focused_window->text_input_state());
 }
 
 void WindowTreeHostImpl::OnAccelerator(uint32_t accelerator_id,
                                        mojom::EventPtr event) {
-  client()->OnAccelerator(accelerator_id, std::move(event));
+  GetWindowTree()->OnAccelerator(accelerator_id, std::move(event));
 }
 
 void WindowTreeHostImpl::SetFocusedWindowFromEventDispatcher(
     ServerWindow* new_focused_window) {
   SetFocusedWindow(new_focused_window);
 }
 
 ServerWindow* WindowTreeHostImpl::GetFocusedWindowForEventDispatcher() {
   return GetFocusedWindow();
 }
@@ skipping 11 matching lines @@
   DispatchInputEventToWindowImpl(target, in_nonclient_area, std::move(event));
 }
 
 void WindowTreeHostImpl::OnWindowDestroyed(ServerWindow* window) {
   windows_needing_frame_destruction_.erase(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace mus