| Index: components/mus/ws/window_tree_host_impl.cc
|
| diff --git a/components/mus/ws/window_tree_host_impl.cc b/components/mus/ws/window_tree_host_impl.cc
|
| index f1200a6648dfae284c3b77363ad603769772aaf8..8e28825e84228a3207c111d8942e5bae0a6a21e5 100644
|
| --- a/components/mus/ws/window_tree_host_impl.cc
|
| +++ b/components/mus/ws/window_tree_host_impl.cc
|
| @@ -234,18 +234,6 @@ 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)
|
| @@ -518,7 +506,7 @@ void WindowTreeHostImpl::OnFocusChanged(
|
|
|
| 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(
|
|
|