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

Unified Diff: components/mus/mus_app.cc

Issue 2079233003: Ozone Mojo setup in mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698