Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: components/mus/ws/window_tree_host_impl.cc

Issue 1656123002: Moves accelerator registration to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mandoline Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/ws/window_tree_host_impl.h ('k') | components/mus/ws/window_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « components/mus/ws/window_tree_host_impl.h ('k') | components/mus/ws/window_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698