Index: components/mus/mus_app.cc |
diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc |
index b18917b138c2f8018880c1d7a39f557b72ab3bd7..2dad24a14e097d4b1f6b367183c93d50db403dca 100644 |
--- a/components/mus/mus_app.cc |
+++ b/components/mus/mus_app.cc |
@@ -158,10 +158,13 @@ void MusApp::Initialize(shell::Connector* connector, |
#if defined(USE_OZONE) |
// The ozone platform can provide its own event source. So initialize the |
// platform before creating the default event source. |
- // TODO(rjkroege): Add tracing here. |
// Because GL libraries need to be initialized before entering the sandbox, |
// in MUS, |InitializeForUI| will load the GL libraries. |
- ui::OzonePlatform::InitializeForUI(); |
+ ui::OzonePlatform::InitParams params; |
+ params.connector = connector; |
+ params.single_process = false; |
+ |
+ ui::OzonePlatform::InitializeForUI(params); |
// TODO(kylechar): We might not always want a US keyboard layout. |
ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() |
@@ -220,6 +223,10 @@ bool MusApp::AcceptConnection(Connection* connection) { |
if (input_device_server_.IsRegisteredAsObserver()) |
input_device_server_.AddInterface(connection); |
+#if defined(USE_OZONE) |
+ ui::OzonePlatform::GetInstance()->AddInterfaces(connection); |
+#endif |
+ |
return true; |
} |