| Index: components/view_manager/public/cpp/lib/view_tree_client_impl.cc
|
| diff --git a/components/view_manager/public/cpp/lib/view_tree_client_impl.cc b/components/view_manager/public/cpp/lib/view_tree_client_impl.cc
|
| index 4bf28e2042bbbbe42ce75e525bf72f362f737981..ad8309685ad4a326637ebd300efadc845f6f8368 100644
|
| --- a/components/view_manager/public/cpp/lib/view_tree_client_impl.cc
|
| +++ b/components/view_manager/public/cpp/lib/view_tree_client_impl.cc
|
| @@ -146,14 +146,6 @@ void ViewTreeClientImpl::SetBounds(Id view_id, const Rect& bounds) {
|
| tree_->SetViewBounds(view_id, bounds.Clone(), ActionCompletedCallback());
|
| }
|
|
|
| -void ViewTreeClientImpl::SetSurfaceId(Id view_id, SurfaceIdPtr surface_id) {
|
| - DCHECK(tree_);
|
| - if (surface_id.is_null())
|
| - return;
|
| - tree_->SetViewSurfaceId(
|
| - view_id, surface_id.Pass(), ActionCompletedCallback());
|
| -}
|
| -
|
| void ViewTreeClientImpl::SetFocus(Id view_id) {
|
| // In order for us to get here we had to have exposed a view, which implies we
|
| // got a connection.
|
| @@ -202,6 +194,13 @@ void ViewTreeClientImpl::EmbedAllowingReembed(mojo::URLRequestPtr request,
|
| ActionCompletedCallback());
|
| }
|
|
|
| +void ViewTreeClientImpl::RequestSurface(Id view_id,
|
| + InterfaceRequest<Surface> surface,
|
| + SurfaceClientPtr client) {
|
| + DCHECK(tree_);
|
| + tree_->RequestSurface(view_id, surface.Pass(), client.Pass());
|
| +}
|
| +
|
| void ViewTreeClientImpl::AddView(View* view) {
|
| DCHECK(views_.find(view->id()) == views_.end());
|
| views_[view->id()] = view;
|
|
|