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

Unified Diff: content/renderer/render_thread_impl.h

Issue 236813002: Move Mojo channel initialization closer to IPC::Channel setup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include guards Created 6 years, 8 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
Index: content/renderer/render_thread_impl.h
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 4c945b1f971141ac37b3affc4fb0318dd6c390b6..33fcfc2bca5db49967fe19981c62b55911cde531 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -401,6 +401,11 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
size_t height,
unsigned internalformat) OVERRIDE;
+ // mojo::ShellClient implementation:
+ virtual void AcceptConnection(
+ const mojo::String& service_name,
+ mojo::ScopedMessagePipeHandle message_pipe) OVERRIDE;
+
void Init();
void OnSetZoomLevelForCurrentURL(const std::string& scheme,
@@ -432,6 +437,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateOffscreenContext3d();
+ MojoApplication mojo_application_;
+
// These objects live solely on the render thread.
scoped_ptr<AppCacheDispatcher> appcache_dispatcher_;
scoped_ptr<DomStorageDispatcher> dom_storage_dispatcher_;

Powered by Google App Engine
This is Rietveld 408576698