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

services/ui/ws/display_manager.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_DISPLAY_MANAGER_H_
 #define SERVICES_UI_WS_DISPLAY_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "services/ui/display/screen_manager_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "ui/display/display.h"
 
 namespace ui {
+class EventRewriter;
 namespace ws {
 
 class CursorLocationManager;
 class Display;
 class ServerWindow;
 class UserDisplayManager;
 class UserIdTracker;
 class WindowManagerDisplayRoot;
 class WindowServer;
 
@@ skipping 37 matching lines @@
       const ServerWindow* window) const;
   // TODO(sky): constness here is wrong! fix!
   WindowManagerDisplayRoot* GetWindowManagerDisplayRoot(
       const ServerWindow* window);
 
   bool has_displays() const { return !displays_.empty(); }
   bool has_active_or_pending_displays() const {
     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();
 
   // Called when the AcceleratedWidget is available for |display|.
   void OnDisplayAcceleratedWidgetAvailable(Display* display);
 
  private:
   // UserIdTrackerObserver:
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;
 
   // display::ScreenManagerDelegate:
   void OnDisplayAdded(const display::Display& display,
                       const display::ViewportMetrics& metrics) override;
   void OnDisplayRemoved(int64_t id) override;
   void OnDisplayModified(const display::Display& display,
                          const display::ViewportMetrics& metrics) override;
   void OnPrimaryDisplayChanged(int64_t primary_display_id) override;
 
   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_;
   std::set<Display*> displays_;
 
   std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_;
 
   std::map<UserId, std::unique_ptr<CursorLocationManager>>
       cursor_location_managers_;
 
   // ID to use for next root node.
   ClientSpecificId next_root_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_MANAGER_H_