Index: services/ui/public/cpp/window_tree_client.cc |
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc |
index d708659579205421d5a12514b49c8d8151ff75d5..2dbd61dd354b6bb1c5bc9d04d252542424f2c165 100644 |
--- a/services/ui/public/cpp/window_tree_client.cc |
+++ b/services/ui/public/cpp/window_tree_client.cc |
@@ -153,7 +153,7 @@ void WindowTreeClient::ConnectViaWindowTreeFactory( |
mojom::WindowTreeFactoryPtr factory; |
connector->ConnectToInterface(ui::mojom::kServiceName, &factory); |
mojom::WindowTreePtr window_tree; |
- factory->CreateWindowTree(GetProxy(&window_tree), |
+ factory->CreateWindowTree(MakeRequest(&window_tree), |
binding_.CreateInterfacePtrAndBind()); |
SetWindowTree(std::move(window_tree)); |
} |
@@ -165,7 +165,7 @@ void WindowTreeClient::ConnectAsWindowManager( |
mojom::WindowManagerWindowTreeFactoryPtr factory; |
connector->ConnectToInterface(ui::mojom::kServiceName, &factory); |
mojom::WindowTreePtr window_tree; |
- factory->CreateWindowTree(GetProxy(&window_tree), |
+ factory->CreateWindowTree(MakeRequest(&window_tree), |
binding_.CreateInterfacePtrAndBind()); |
SetWindowTree(std::move(window_tree)); |
} |
@@ -567,8 +567,8 @@ void WindowTreeClient::SetWindowTree(mojom::WindowTreePtr window_tree_ptr) { |
&WindowTreeClient::OnConnectionLost, weak_factory_.GetWeakPtr())); |
if (window_manager_delegate_) { |
- tree_ptr_->GetWindowManagerClient(GetProxy(&window_manager_internal_client_, |
- tree_ptr_.associated_group())); |
+ tree_ptr_->GetWindowManagerClient(MakeRequest( |
+ &window_manager_internal_client_, tree_ptr_.associated_group())); |
} |
} |
@@ -800,8 +800,8 @@ void WindowTreeClient::OnEmbed(ClientSpecificId client_id, |
is_from_embed_ = true; |
if (window_manager_delegate_) { |
- tree_ptr_->GetWindowManagerClient(GetProxy(&window_manager_internal_client_, |
- tree_ptr_.associated_group())); |
+ tree_ptr_->GetWindowManagerClient(MakeRequest( |
+ &window_manager_internal_client_, tree_ptr_.associated_group())); |
} |
OnEmbedImpl(tree_ptr_.get(), client_id, std::move(root_data), display_id, |