Index: components/mus/mus_app.cc |
diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc |
index c81ced9fa6d888157dd206f9fd0dde8ba2fffecd..1c26b5c480d3b609287eb3a683a86d7e0e732f0d 100644 |
--- a/components/mus/mus_app.cc |
+++ b/components/mus/mus_app.cc |
@@ -180,6 +180,11 @@ void MusApp::Initialize(shell::Connector* connector, |
event_source_ = ui::PlatformEventSource::CreateDefault(); |
#endif |
+ // This needs to happen after DeviceDataManager has been constructed. That |
+ // happens either during OzonePlatform or PlatformEventSource initialization, |
+ // so keep this line below both of those. |
+ input_device_server_.RegisterAsObserver(); |
+ |
if (use_chrome_gpu_command_buffer_) { |
GpuServiceMus::GetInstance(); |
} else { |
@@ -211,6 +216,8 @@ bool MusApp::AcceptConnection(Connection* connection) { |
connection->AddInterface<Gpu>(this); |
} |
+ input_device_server_.RegisterInterface(connection); |
+ |
return true; |
} |