diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 17:19:17 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 17:19:17 +0000 |
| commit | 2db531074be20594b38f882448fa918996cd2abc (patch) | |
| tree | f7ee240697eefcb53896ede6a01d46266554d190 /remoting/remoting.gyp | |
| parent | a2f2e479644f4073b00b66d5efc67789b12d1072 (diff) | |
| download | chromium_src-2db531074be20594b38f882448fa918996cd2abc.zip chromium_src-2db531074be20594b38f882448fa918996cd2abc.tar.gz chromium_src-2db531074be20594b38f882448fa918996cd2abc.tar.bz2 | |
Wire up the codepath from Javascript into Jingle for IQ packets.
Flushes out XmppProxy, the thread-safe interface that matches up Pepper with Jingle and plumbs a ConnectSandboxed method through everything so that the connection type can be chosen at runtime.
BUG=51198
TEST=Check that stanzas are sent/received from JS, and that xmpp still works.
Review URL: http://codereview.chromium.org/6603036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index f651a9c..eb6fe57 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -97,6 +97,8 @@ 'client/plugin/pepper_view_proxy.h', 'client/plugin/pepper_util.cc', 'client/plugin/pepper_util.h', + 'client/plugin/pepper_xmpp_proxy.cc', + 'client/plugin/pepper_xmpp_proxy.h', '../media/base/yuv_convert.cc', '../media/base/yuv_convert.h', '../media/base/yuv_row.h', @@ -350,8 +352,6 @@ 'jingle_glue/iq_request.h', 'jingle_glue/jingle_client.cc', 'jingle_glue/jingle_client.h', - 'jingle_glue/jingle_info_task.cc', - 'jingle_glue/jingle_info_task.h', 'jingle_glue/jingle_thread.cc', 'jingle_glue/jingle_thread.h', 'jingle_glue/stream_socket_adapter.cc', @@ -362,6 +362,7 @@ 'jingle_glue/ssl_socket_adapter.h', 'jingle_glue/utils.cc', 'jingle_glue/utils.h', + 'jingle_glue/xmpp_proxy.h', 'jingle_glue/xmpp_socket_adapter.cc', 'jingle_glue/xmpp_socket_adapter.h', ], |