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

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

Issue 694923002: Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 | « mojo/services/html_viewer/html_document_view.cc ('k') | mojo/services/network/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 dc56ddca963ae907e27e874e8886531b2db006ab..dcb7f2a0cdab895e1e9b93f9d06e2dc4573e25b8 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -37,28 +37,21 @@ class HTMLViewer;
class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
public:
- ContentHandlerImpl(Shell* shell,
- scoped_refptr<base::MessageLoopProxy> compositor_thread,
+ ContentHandlerImpl(scoped_refptr<base::MessageLoopProxy> compositor_thread,
WebMediaPlayerFactory* web_media_player_factory)
- : shell_(shell),
- compositor_thread_(compositor_thread),
+ : compositor_thread_(compositor_thread),
web_media_player_factory_(web_media_player_factory) {}
~ContentHandlerImpl() override {}
private:
// Overridden from ContentHandler:
- void OnConnect(
- const mojo::String& requestor_url,
- URLResponsePtr response,
- InterfaceRequest<ServiceProvider> service_provider_request) override {
+ void StartApplication(ShellPtr shell, URLResponsePtr response) override {
new HTMLDocumentView(response.Pass(),
- service_provider_request.Pass(),
- shell_,
+ shell.Pass(),
compositor_thread_,
web_media_player_factory_);
}
- Shell* shell_;
scoped_refptr<base::MessageLoopProxy> compositor_thread_;
WebMediaPlayerFactory* web_media_player_factory_;
@@ -75,7 +68,6 @@ class HTMLViewer : public ApplicationDelegate,
private:
// Overridden from ApplicationDelegate:
void Initialize(ApplicationImpl* app) override {
- shell_ = app->shell();
blink_platform_impl_.reset(new BlinkPlatformImpl(app));
blink::initialize(blink_platform_impl_.get());
#if !defined(COMPONENT_BUILD)
@@ -110,13 +102,12 @@ class HTMLViewer : public ApplicationDelegate,
void Create(ApplicationConnection* connection,
InterfaceRequest<ContentHandler> request) override {
BindToRequest(
- new ContentHandlerImpl(shell_, compositor_thread_.message_loop_proxy(),
+ new ContentHandlerImpl(compositor_thread_.message_loop_proxy(),
web_media_player_factory_.get()),
&request);
}
scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
- Shell* shell_;
base::Thread compositor_thread_;
scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_;
« no previous file with comments | « mojo/services/html_viewer/html_document_view.cc ('k') | mojo/services/network/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698