| Index: mojo/services/html_viewer/html_viewer.cc
|
| diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
|
| index fb2512cc4265a109776ac3f3872d9c072739e94a..0a018bb2f04b2a7b17ae1006fa356ffc9794ea17 100644
|
| --- a/mojo/services/html_viewer/html_viewer.cc
|
| +++ b/mojo/services/html_viewer/html_viewer.cc
|
| @@ -50,9 +50,9 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
|
| blink::shutdown();
|
| }
|
|
|
| - void Load(URLResponsePtr response) {
|
| + void Load(ResponseDetailsPtr response_details) {
|
| // Need to wait for OnEmbed.
|
| - response_ = response.Pass();
|
| + response_details_ = response_details.Pass();
|
| MaybeLoad();
|
| }
|
|
|
| @@ -85,8 +85,8 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
|
| }
|
|
|
| void MaybeLoad() {
|
| - if (document_view_ && response_)
|
| - document_view_->Load(response_.Pass());
|
| + if (document_view_ && response_details_)
|
| + document_view_->Load(response_details_->response.Pass());
|
| }
|
|
|
| scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
|
| @@ -94,7 +94,7 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
|
|
|
| // TODO(darin): Figure out proper ownership of this instance.
|
| HTMLDocumentView* document_view_;
|
| - URLResponsePtr response_;
|
| + ResponseDetailsPtr response_details_;
|
| InterfaceFactoryImplWithContext<NavigatorImpl, HTMLViewer> navigator_factory_;
|
| ViewManagerClientFactory view_manager_client_factory_;
|
|
|
| @@ -105,7 +105,7 @@ void NavigatorImpl::Navigate(
|
| uint32_t node_id,
|
| NavigationDetailsPtr navigation_details,
|
| ResponseDetailsPtr response_details) {
|
| - viewer_->Load(response_details->response.Pass());
|
| + viewer_->Load(response_details.Pass());
|
| }
|
|
|
| // static
|
|
|