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

Unified Diff: services/ui/ws/display_manager.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Address review issues. Created 3 years, 9 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
Index: services/ui/ws/display_manager.cc
diff --git a/services/ui/ws/display_manager.cc b/services/ui/ws/display_manager.cc
index 06b19e60b73a378a599663cdf2f2de73e314b891..7e1cb0250f1b7608cc89ec53ce435ee02f28f5bf 100644
--- a/services/ui/ws/display_manager.cc
+++ b/services/ui/ws/display_manager.cc
@@ -21,6 +21,11 @@
#include "services/ui/ws/window_manager_window_tree_factory.h"
#include "services/ui/ws/window_server_delegate.h"
#include "services/ui/ws/window_tree.h"
+#include "ui/events/event_rewriter.h"
+
+#if defined(OS_CHROMEOS)
+#include "ui/chromeos/events/event_rewriter_chromeos.h"
+#endif
namespace ui {
namespace ws {
@@ -33,6 +38,13 @@ DisplayManager::DisplayManager(WindowServer* window_server,
: window_server_(window_server),
user_id_tracker_(user_id_tracker),
next_root_id_(0) {
+#if defined(OS_CHROMEOS)
+ // TODO: http://crbug.com/701468 fix function key preferences and sticky keys.
+ ui::EventRewriterChromeOS::Delegate* delegate = nullptr;
+ ui::EventRewriter* sticky_keys_controller = nullptr;
+ event_rewriter_ = base::MakeUnique<ui::EventRewriterChromeOS>(
+ delegate, sticky_keys_controller);
+#endif
user_id_tracker_->AddObserver(this);
}
@@ -161,6 +173,8 @@ void DisplayManager::OnDisplayAcceleratedWidgetAvailable(Display* display) {
const bool is_first_display = displays_.empty();
displays_.insert(display);
pending_displays_.erase(display);
+ if (event_rewriter_)
+ display->platform_display()->AddEventRewriter(event_rewriter_.get());
window_server_->OnDisplayReady(display, is_first_display);
}

Powered by Google App Engine
This is Rietveld 408576698