diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 22:00:07 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 22:00:07 +0000 |
| commit | 907e1d669f44c15388e8f7183cb8ea706dae7771 (patch) | |
| tree | a770cfeee5e08b24827a494a99e48f8e1df4fec4 /content/content_renderer.gypi | |
| parent | e1c12bc9c1497a2081f1f23071f4d277fafabac8 (diff) | |
| download | chromium_src-907e1d669f44c15388e8f7183cb8ea706dae7771.zip chromium_src-907e1d669f44c15388e8f7183cb8ea706dae7771.tar.gz chromium_src-907e1d669f44c15388e8f7183cb8ea706dae7771.tar.bz2 | |
Adds the ability for the renderer to create the mojo channel
This is initiated and owned by RenderProcessHost. I've added a
method to RenderProcessHostImpl to create the channel. No one is
calling it yet, that will come after this.
RenderProcessHostImpl::CreateMojoChannel initiates the connection and
sends an IPC message to the renderer. The renderer than creates its
end of the connection.
End to end test will come once I've added all the pieces.
BUG=none
TEST=none
R=darin@chromium.org, tsepez@chromium.org, viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/195993010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_renderer.gypi')
| -rw-r--r-- | content/content_renderer.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 2991d38..5ae8194 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -304,6 +304,8 @@ 'renderer/menu_item_builder.h', 'renderer/mhtml_generator.cc', 'renderer/mhtml_generator.h', + 'renderer/mojo/mojo_render_process_observer.cc', + 'renderer/mojo/mojo_render_process_observer.h', 'renderer/mouse_lock_dispatcher.cc', 'renderer/mouse_lock_dispatcher.h', 'renderer/notification_provider.cc', @@ -575,8 +577,10 @@ ], }], # TODO(sky): temporary until mojo runs on mac. - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'sources!': [ + 'renderer/mojo/mojo_render_process_observer.cc', + 'renderer/mojo/mojo_render_process_observer.h', 'renderer/web_ui_mojo.cc', 'renderer/web_ui_mojo.h', 'renderer/web_ui_mojo_context_state.cc', |