summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 05:57:27 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 05:57:27 +0000
commite3f3047d03c2a039a7202ef0a81f221c96773598 (patch)
tree504dc93c7bfed4700867b63d8fef45d32dd86062 /remoting/webapp
parent70c4776c2e87adf2594f42d240842627c54e966e (diff)
downloadchromium_src-e3f3047d03c2a039a7202ef0a81f221c96773598.zip
chromium_src-e3f3047d03c2a039a7202ef0a81f221c96773598.tar.gz
chromium_src-e3f3047d03c2a039a7202ef0a81f221c96773598.tar.bz2
Add separate nonce version of connect calls to ChromotingScriptableObject.
BUG=none TEST=manual Review URL: http://codereview.chromium.org/7042022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/me2mom/remoting_session.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/webapp/me2mom/remoting_session.js b/remoting/webapp/me2mom/remoting_session.js
index 8a605dd..1a2629e 100644
--- a/remoting/webapp/me2mom/remoting_session.js
+++ b/remoting/webapp/me2mom/remoting_session.js
@@ -55,8 +55,8 @@ function registerConnection() {
var clientjid = xhr.responseText;
remoting.plugin.sendIq = sendIq;
- remoting.plugin.connectSandboxed(clientjid, remoting.hostjid,
- remoting.accessCode);
+ remoting.plugin.connect(remoting.hostjid, clientjid,
+ remoting.accessCode);
// TODO(ajwong): This should just be feedIq();
window.setTimeout(feedIq, 1000);
} else {
@@ -123,8 +123,8 @@ function init() {
if (remoting.connectMethod == 'sandboxed') {
registerConnection();
} else {
- plugin.connect(remoting.username, remoting.hostjid,
- remoting.xmppAuthToken, remoting.accessCode);
+ plugin.connectUnsandboxed(remoting.hostjid, remoting.username,
+ remoting.xmppAuthToken, remoting.accessCode);
}
} else {
addToDebugLog('ERROR: remoting plugin not loaded');