Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1388)

Unified Diff: mojo/services/html_viewer/html_document_view.cc

Issue 699123003: mojo: Fix html_viewer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_document_view.cc
diff --git a/mojo/services/html_viewer/html_document_view.cc b/mojo/services/html_viewer/html_document_view.cc
index cb94931da3bdbdfe629b49faca4eae45a193e97c..01af412a39adb7b8cdca36545407a5a76d581c85 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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698