| Index: ui/views/mus/window_manager_connection.cc
|
| diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
|
| index 3be02e082a5a98fd0202007aa4410157451a1be9..83b6f0822042e5b6ba318c2fe2609b049e3cae95 100644
|
| --- a/ui/views/mus/window_manager_connection.cc
|
| +++ b/ui/views/mus/window_manager_connection.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ui/views/mus/window_manager_connection.h"
|
|
|
| #include "components/mus/public/cpp/window_tree_connection.h"
|
| -#include "components/mus/public/interfaces/view_tree.mojom.h"
|
| +#include "components/mus/public/interfaces/window_tree.mojom.h"
|
| #include "mojo/application/public/cpp/application_connection.h"
|
| #include "mojo/application/public/cpp/application_impl.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
| @@ -85,13 +85,13 @@ WindowManagerConnection::WindowManagerConnection(
|
| WindowManagerConnection::~WindowManagerConnection() {}
|
|
|
| mus::Window* WindowManagerConnection::CreateWindow() {
|
| - mojo::ViewTreeClientPtr view_tree_client;
|
| - mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client_request =
|
| - GetProxy(&view_tree_client);
|
| - window_manager_->OpenWindow(view_tree_client.Pass());
|
| + mus::mojom::WindowTreeClientPtr window_tree_client;
|
| + mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
|
| + window_tree_client_request = GetProxy(&window_tree_client);
|
| + window_manager_->OpenWindow(window_tree_client.Pass());
|
| mus::WindowTreeConnection* window_tree_connection =
|
| mus::WindowTreeConnection::Create(
|
| - this, view_tree_client_request.Pass(),
|
| + this, window_tree_client_request.Pass(),
|
| mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED);
|
| DCHECK(window_tree_connection->GetRoot());
|
| return window_tree_connection->GetRoot();
|
|
|