| Index: components/mus/ws/client_connection.cc
|
| diff --git a/components/mus/ws/client_connection.cc b/components/mus/ws/client_connection.cc
|
| index d3e3b2afbb920dff9ae93d20d1db82e3f167f331..9f43ab9bf583479d5a687d8bb2f1c846b5fc0a24 100644
|
| --- a/components/mus/ws/client_connection.cc
|
| +++ b/components/mus/ws/client_connection.cc
|
| @@ -19,7 +19,7 @@ ClientConnection::~ClientConnection() {}
|
| DefaultClientConnection::DefaultClientConnection(
|
| scoped_ptr<WindowTreeImpl> service_impl,
|
| ConnectionManager* connection_manager,
|
| - mojo::InterfaceRequest<mojom::WindowTree> service_request,
|
| + mojom::WindowTreeRequest service_request,
|
| mojom::WindowTreeClientPtr client)
|
| : ClientConnection(std::move(service_impl), client.get()),
|
| connection_manager_(connection_manager),
|
| @@ -29,6 +29,15 @@ DefaultClientConnection::DefaultClientConnection(
|
| [this]() { connection_manager_->OnConnectionError(this); });
|
| }
|
|
|
| +DefaultClientConnection::DefaultClientConnection(
|
| + scoped_ptr<WindowTreeImpl> service_impl,
|
| + ConnectionManager* connection_manager,
|
| + mojom::WindowTreeClientPtr client)
|
| + : ClientConnection(std::move(service_impl), client.get()),
|
| + connection_manager_(connection_manager),
|
| + binding_(service()),
|
| + client_(std::move(client)) {}
|
| +
|
| DefaultClientConnection::~DefaultClientConnection() {}
|
|
|
| void DefaultClientConnection::SetIncomingMethodCallProcessingPaused(
|
| @@ -39,6 +48,11 @@ void DefaultClientConnection::SetIncomingMethodCallProcessingPaused(
|
| binding_.ResumeIncomingMethodCallProcessing();
|
| }
|
|
|
| +mojom::WindowTreePtr DefaultClientConnection::CreateInterfacePtrAndBind() {
|
| + DCHECK(!binding_.is_bound());
|
| + return binding_.CreateInterfacePtrAndBind();
|
| +}
|
| +
|
| mojom::WindowManager* DefaultClientConnection::GetWindowManager() {
|
| client_->GetWindowManager(
|
| GetProxy(&window_manager_internal_, client_.associated_group()));
|
|
|