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

Unified Diff: components/mus/mus_app.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
« 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 439d2efd2c8751777ccbe221eab39beef794cce6..e9f7ea3675ff295931d558fe783fea9bdd2a6cc3 100644
--- a/components/mus/mus_app.cc
+++ b/components/mus/mus_app.cc
@@ -128,14 +128,15 @@ void MandolineUIServicesApp::Create(mojo::ApplicationConnection* connection,
void MandolineUIServicesApp::CreateWindowTreeHost(
mojo::InterfaceRequest<mojom::WindowTreeHost> host,
mojom::WindowTreeHostClientPtr host_client,
- mojom::WindowTreeClientPtr tree_client) {
+ mojom::WindowTreeClientPtr tree_client,
+ mojom::WindowManagerPtr window_manager) {
DCHECK(connection_manager_.get());
// TODO(fsamuel): We need to make sure that only the window manager can create
// new roots.
- ws::WindowTreeHostImpl* host_impl =
- new ws::WindowTreeHostImpl(host_client.Pass(), connection_manager_.get(),
- app_impl_, gpu_state_, surfaces_state_);
+ ws::WindowTreeHostImpl* host_impl = new ws::WindowTreeHostImpl(
+ host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_,
+ surfaces_state_, window_manager.Pass());
// WindowTreeHostConnection manages its own lifetime.
host_impl->Init(new ws::WindowTreeHostConnectionImpl(
« 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