summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2014-12-12 06:36:15 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-12 14:37:29 +0000
commitf7ec382c0c65e1b07c3a99cfc87262dcb8c946bc (patch)
tree1681d4890a2ab4a72c0d189d80bc22f7224a26e4 /mojo
parent987f84d0d84d4e59b36ce8532ddcaf174f1346cd (diff)
downloadchromium_src-f7ec382c0c65e1b07c3a99cfc87262dcb8c946bc.zip
chromium_src-f7ec382c0c65e1b07c3a99cfc87262dcb8c946bc.tar.gz
chromium_src-f7ec382c0c65e1b07c3a99cfc87262dcb8c946bc.tar.bz2
Move Load() from HTMLDocument::OnEmbed() to the constructor.
TBR=aa@chromium.org Review URL: https://codereview.chromium.org/796963003 Cr-Commit-Position: refs/heads/master@{#308070}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/services/html_viewer/html_document.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc
index 1c9a00b..eb9185e 100644
--- a/mojo/services/html_viewer/html_document.cc
+++ b/mojo/services/html_viewer/html_document.cc
@@ -101,6 +101,7 @@ HTMLDocument::HTMLDocument(
exported_services_.AddService(this);
exported_services_.AddService(&view_manager_client_factory_);
WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+ Load(response_.Pass());
}
HTMLDocument::~HTMLDocument() {
@@ -121,8 +122,6 @@ void HTMLDocument::OnEmbed(
embedder_service_provider_ = embedder_service_provider.Pass();
navigator_host_.set_service_provider(embedder_service_provider_.get());
- Load(response_.Pass());
-
blink::WebSize root_size(root_->bounds().width, root_->bounds().height);
web_view_->resize(root_size);
web_layer_tree_view_impl_->setViewportSize(root_size);