OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" | 5 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" |
6 | 6 |
7 #include "components/view_manager/public/cpp/lib/view_private.h" | 7 #include "components/view_manager/public/cpp/lib/view_private.h" |
8 #include "components/view_manager/public/cpp/util.h" | 8 #include "components/view_manager/public/cpp/util.h" |
9 #include "components/view_manager/public/cpp/view_manager_delegate.h" | 9 #include "components/view_manager/public/cpp/view_manager_delegate.h" |
10 #include "components/view_manager/public/cpp/view_observer.h" | 10 #include "components/view_manager/public/cpp/view_observer.h" |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 const std::string& name, | 185 const std::string& name, |
186 const std::vector<uint8_t>& data) { | 186 const std::vector<uint8_t>& data) { |
187 DCHECK(service_); | 187 DCHECK(service_); |
188 service_->SetViewProperty(view_id, | 188 service_->SetViewProperty(view_id, |
189 String(name), | 189 String(name), |
190 Array<uint8_t>::From(data), | 190 Array<uint8_t>::From(data), |
191 ActionCompletedCallback()); | 191 ActionCompletedCallback()); |
192 } | 192 } |
193 | 193 |
194 void ViewManagerClientImpl::Embed(const String& url, Id view_id) { | 194 void ViewManagerClientImpl::Embed(const String& url, Id view_id) { |
195 Embed(url, view_id, nullptr, nullptr); | 195 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| 196 request->url = mojo::String::From(url); |
| 197 Embed(request.Pass(), view_id, nullptr, nullptr); |
196 } | 198 } |
197 | 199 |
198 void ViewManagerClientImpl::Embed(const String& url, | 200 void ViewManagerClientImpl::Embed(mojo::URLRequestPtr request, |
199 Id view_id, | 201 Id view_id, |
200 InterfaceRequest<ServiceProvider> services, | 202 InterfaceRequest<ServiceProvider> services, |
201 ServiceProviderPtr exposed_services) { | 203 ServiceProviderPtr exposed_services) { |
202 DCHECK(service_); | 204 DCHECK(service_); |
203 service_->EmbedUrl(url, view_id, services.Pass(), exposed_services.Pass(), | 205 service_->EmbedRequest(request.Pass(), view_id, services.Pass(), |
204 ActionCompletedCallback()); | 206 exposed_services.Pass(), ActionCompletedCallback()); |
205 } | 207 } |
206 | 208 |
207 void ViewManagerClientImpl::Embed(Id view_id, ViewManagerClientPtr client) { | 209 void ViewManagerClientImpl::Embed(Id view_id, ViewManagerClientPtr client) { |
208 DCHECK(service_); | 210 DCHECK(service_); |
209 service_->Embed(view_id, client.Pass(), ActionCompletedCallback()); | 211 service_->Embed(view_id, client.Pass(), ActionCompletedCallback()); |
210 } | 212 } |
211 | 213 |
212 void ViewManagerClientImpl::AddView(View* view) { | 214 void ViewManagerClientImpl::AddView(View* view) { |
213 DCHECK(views_.find(view->id()) == views_.end()); | 215 DCHECK(views_.find(view->id()) == views_.end()); |
214 views_[view->id()] = view; | 216 views_[view->id()] = view; |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 void ViewManagerClientImpl::OnActionCompleted(bool success) { | 438 void ViewManagerClientImpl::OnActionCompleted(bool success) { |
437 if (!change_acked_callback_.is_null()) | 439 if (!change_acked_callback_.is_null()) |
438 change_acked_callback_.Run(); | 440 change_acked_callback_.Run(); |
439 } | 441 } |
440 | 442 |
441 Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() { | 443 Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() { |
442 return [this](bool success) { OnActionCompleted(success); }; | 444 return [this](bool success) { OnActionCompleted(success); }; |
443 } | 445 } |
444 | 446 |
445 } // namespace mojo | 447 } // namespace mojo |
OLD | NEW |