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

Unified Diff: components/mus/mus_app.cc

Issue 2072343002: Changes how window manager obtains WindowTree from mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include 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 | « components/mus/mus_app.h ('k') | components/mus/public/cpp/BUILD.gn » ('j') | 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 75f219276ece862d839c2dde826b59938e48b268..de22b9a9cdfb52821d6d4c9e89220f23b47e722c 100644
--- a/components/mus/mus_app.cc
+++ b/components/mus/mus_app.cc
@@ -199,7 +199,7 @@ bool MusApp::AcceptConnection(Connection* connection) {
connection->AddInterface<mojom::DisplayManager>(this);
connection->AddInterface<mojom::UserAccessManager>(this);
connection->AddInterface<WindowTreeHostFactory>(this);
- connection->AddInterface<mojom::WindowManagerFactoryService>(this);
+ connection->AddInterface<mojom::WindowManagerWindowTreeFactory>(this);
connection->AddInterface<mojom::WindowTreeFactory>(this);
if (test_config_)
connection->AddInterface<WindowServerTest>(this);
@@ -272,9 +272,9 @@ void MusApp::Create(shell::Connection* connection,
}
void MusApp::Create(shell::Connection* connection,
- mojom::WindowManagerFactoryServiceRequest request) {
+ mojom::WindowManagerWindowTreeFactoryRequest request) {
AddUserIfNecessary(connection);
- window_server_->window_manager_factory_registry()->Register(
+ window_server_->window_manager_window_tree_factory_set()->Add(
connection->GetRemoteIdentity().user_id(), std::move(request));
}
« no previous file with comments | « components/mus/mus_app.h ('k') | components/mus/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698