mustash: Use ui::chromeos::EventRewriter in mus

services/ui/ws/display_manager.h

Index: services/ui/ws/display_manager.h
diff --git a/services/ui/ws/display_manager.h b/services/ui/ws/display_manager.h
index 0f240258379227d88c12d43f3be6bebd318b60b8..ae07c595b14784d6417b270918ec8bfc6364ad2a 100644
--- a/services/ui/ws/display_manager.h
+++ b/services/ui/ws/display_manager.h
@@ -17,6 +17,7 @@
 #include "ui/display/display.h"
 
 namespace ui {
+class EventRewriter;
 namespace ws {
 
 class CursorLocationManager;
@@ -74,6 +75,8 @@ class DisplayManager : public UserIdTrackerObserver,
     return !displays_.empty() || !pending_displays_.empty();
   }
 
+  ui::EventRewriter* event_rewriter() { return event_rewriter_.get(); }
+
   // Returns the id for the next root window (both for the root of a Display
   // as well as the root of WindowManagers).
   WindowId GetAndAdvanceNextRootId();
@@ -97,6 +100,9 @@ class DisplayManager : public UserIdTrackerObserver,
   WindowServer* window_server_;
   UserIdTracker* user_id_tracker_;
 
+  // For rewriting ChromeOS function keys.
+  std::unique_ptr<ui::EventRewriter> event_rewriter_;

[sadrul, 2017/03/16 05:05:40]

Note that we will need to add more rewriters (accessibility adds several
rewriters). It would be better to maintain a list here.

[sky, 2017/03/16 16:11:43]

Will we need to support rewriters from different services? If so, we need to
make sure we come up with a declarative way to specify what those rewriters do
to avoid having to call out too much during dispatch. This can be done later,
not in this patch.

[sadrul, 2017/03/16 17:37:26]

I actually think those services should simply live in the window server itself,
i.e. window server itself should provide explicit accessibility support (that
relates to windowing/event systems). In other words, I think we should use the
existing event-rewriters here.

[sky, 2017/03/16 20:23:07]

SGTM. I assume then mus grows an API to turn on the rewriters?

+
   // Displays are initially added to |pending_displays_|. When the display is
   // initialized it is moved to |displays_|. WindowServer owns the Displays.
   std::set<Display*> pending_displays_;