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

Unified Diff: remoting/webapp/me2mom/remoting_session.js

Issue 7042022: Add separate nonce version of connect call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge issues Created 9 years, 7 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 | « remoting/client/plugin/chromoting_scriptable_object.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/me2mom/remoting_session.js
diff --git a/remoting/webapp/me2mom/remoting_session.js b/remoting/webapp/me2mom/remoting_session.js
index 8a605ddef32bfde41ab7fcbb6ee54df703d8c9ca..1a2629e8b3da1a3e6975a104e8147a9fa4966641 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');
« no previous file with comments | « remoting/client/plugin/chromoting_scriptable_object.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698