diff options
| author | qsr <qsr@chromium.org> | 2014-11-04 08:48:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-04 16:48:47 +0000 |
| commit | a99b7ad25d02eb26afe3f7ab0f93e62ee75ad514 (patch) | |
| tree | edf3d83a6ebceaa9f668f63a0abca28af90a32f3 /mojo | |
| parent | 988a9bb5eebf30245ab1150d94bca22fc1c9c89e (diff) | |
| download | chromium_src-a99b7ad25d02eb26afe3f7ab0f93e62ee75ad514.zip chromium_src-a99b7ad25d02eb26afe3f7ab0f93e62ee75ad514.tar.gz chromium_src-a99b7ad25d02eb26afe3f7ab0f93e62ee75ad514.tar.bz2 | |
mojo: Fix html_viewer.
R=aa@chromium.org
Review URL: https://codereview.chromium.org/699123003
Cr-Commit-Position: refs/heads/master@{#302618}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/html_document_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mojo/services/html_viewer/html_document_view.cc b/mojo/services/html_viewer/html_document_view.cc index cb94931..01af412 100644 --- a/mojo/services/html_viewer/html_document_view.cc +++ b/mojo/services/html_viewer/html_document_view.cc @@ -89,14 +89,15 @@ HTMLDocumentView::HTMLDocumentView( ShellPtr shell, scoped_refptr<base::MessageLoopProxy> compositor_thread, WebMediaPlayerFactory* web_media_player_factory) - : shell_(shell.Pass()), + : response_(response.Pass()), + shell_(shell.Pass()), web_view_(NULL), root_(NULL), view_manager_client_factory_(shell_.get(), this), compositor_thread_(compositor_thread), web_media_player_factory_(web_media_player_factory), weak_factory_(this) { - Load(response.Pass()); + shell_.set_client(this); } HTMLDocumentView::~HTMLDocumentView() { @@ -110,6 +111,7 @@ void HTMLDocumentView::AcceptConnection(const String& requestor_url, ServiceProviderPtr provider) { exported_services_.AddService(&view_manager_client_factory_); WeakBindToPipe(&exported_services_, provider.PassMessagePipe()); + Load(response_.Pass()); } void HTMLDocumentView::Initialize(Array<String> args) { |