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

Unified Diff: components/mus/public/cpp/lib/window_tree_host_factory.cc

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces Created 5 years, 2 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: components/mus/public/cpp/lib/window_tree_host_factory.cc
diff --git a/components/mus/public/cpp/lib/window_tree_host_factory.cc b/components/mus/public/cpp/lib/window_tree_host_factory.cc
index e63c604230722122d5189072bacb5f2fb22c7cb2..092aa8c63e7c454aeb3b142b1e42da36dc19da38 100644
--- a/components/mus/public/cpp/lib/window_tree_host_factory.cc
+++ b/components/mus/public/cpp/lib/window_tree_host_factory.cc
@@ -13,24 +13,26 @@ namespace mus {
void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory,
mojom::WindowTreeHostClientPtr host_client,
WindowTreeDelegate* delegate,
- mojom::WindowTreeHostPtr* host) {
+ mojom::WindowTreeHostPtr* host,
+ mojom::WindowManagerPtr window_manager) {
mojom::WindowTreeClientPtr tree_client;
WindowTreeConnection::Create(
delegate, GetProxy(&tree_client),
WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
factory->CreateWindowTreeHost(GetProxy(host), host_client.Pass(),
- tree_client.Pass());
+ tree_client.Pass(), window_manager.Pass());
}
void CreateSingleWindowTreeHost(mojo::ApplicationImpl* app,
WindowTreeDelegate* delegate,
- mojom::WindowTreeHostPtr* host) {
+ mojom::WindowTreeHostPtr* host,
+ mojom::WindowManagerPtr window_manager) {
mojom::WindowTreeHostFactoryPtr factory;
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = "mojo:mus";
app->ConnectToService(request.Pass(), &factory);
CreateWindowTreeHost(factory.get(), mojom::WindowTreeHostClientPtr(),
- delegate, host);
+ delegate, host, window_manager.Pass());
}
} // namespace mus
« no previous file with comments | « components/mus/public/cpp/lib/window_tree_client_impl.cc ('k') | components/mus/public/cpp/tests/window_server_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698