Routes calls to WM through WS

components/mus/example/wm/window_manager_application.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/example/wm/window_manager_application.h"
 
 #include "components/mus/example/wm/container.h"
 #include "components/mus/example/wm/window_layout.h"
 #include "components/mus/example/wm/window_manager_impl.h"
 #include "components/mus/public/cpp/util.h"
@@ skipping 11 matching lines @@
   const mus::Id window_id = root_->connection()->GetConnectionId() << 16 |
                             static_cast<uint16_t>(container);
   return root_->GetChildById(window_id);
 }
 
 mus::Window* WindowManagerApplication::GetWindowById(mus::Id id) {
   return root_->GetChildById(id);
 }
 
 void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) {
-  mus::CreateSingleWindowTreeHost(app, this, &host_);
+  mus::mojom::WindowManagerPtr window_manager;
+  requests_.push_back(new mojo::InterfaceRequest<mus::mojom::WindowManager>(
+      mojo::GetProxy(&window_manager)));
+  mus::CreateSingleWindowTreeHost(app, this, &host_, window_manager.Pass());
 }
 
 bool WindowManagerApplication::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService(this);
   return true;
 }
 
 void WindowManagerApplication::OnEmbed(mus::Window* root) {
   root_ = root;
   CreateContainers();
   layout_.reset(
       new WindowLayout(GetWindowForContainer(Container::USER_WINDOWS)));
 
   host_->EnableWindowDraggingForChildren(
       GetWindowForContainer(Container::USER_WINDOWS)->id());
 
-  for (auto request : requests_)
-    new WindowManagerImpl(this, request->Pass());
+  window_manager_.reset(new WindowManagerImpl(this));
+  for (auto request : requests_) {

[Ben Goodger (Google), 2015/10/27 22:25:05]

nit: no braces

[sky, 2015/10/27 22:30:27]

Done.

+    window_manager_binding_.AddBinding(window_manager_.get(), request->Pass());
+  }
+  requests_.clear();
 }
 
 void WindowManagerApplication::OnConnectionLost(
     mus::WindowTreeConnection* connection) {
   // TODO(sky): shutdown.
   NOTIMPLEMENTED();
 }
 
 void WindowManagerApplication::Create(
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mus::mojom::WindowManager> request) {
   if (root_) {
-    new WindowManagerImpl(this, request.Pass());
+    window_manager_binding_.AddBinding(window_manager_.get(), request.Pass());
   } else {
     requests_.push_back(
         new mojo::InterfaceRequest<mus::mojom::WindowManager>(request.Pass()));
   }
 }
 
 void WindowManagerApplication::CreateContainers() {
   for (uint16_t container =
            static_cast<uint16_t>(Container::ALL_USER_BACKGROUND);
        container < static_cast<uint16_t>(Container::COUNT); ++container) {
     mus::Window* window = root_->connection()->NewWindow();
     DCHECK_EQ(mus::LoWord(window->id()), container)
         << "Containers must be created before other windows!";
     window->SetBounds(root_->bounds());
     window->SetVisible(true);
     root_->AddChild(window);
   }
 }