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

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: combine connect calls 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
Index: remoting/webapp/me2mom/remoting_session.js
diff --git a/remoting/webapp/me2mom/remoting_session.js b/remoting/webapp/me2mom/remoting_session.js
index 77b82236f93fa2a706a6530c4032669e163db9e8..35b419bd548323984c9ff2d5a2b0509cab44c254 100644
--- a/remoting/webapp/me2mom/remoting_session.js
+++ b/remoting/webapp/me2mom/remoting_session.js
@@ -54,8 +54,8 @@ function registerConnection() {
var clientjid = xhr.responseText;
remoting.plugin.sendIq = sendIq;
- remoting.plugin.connectSandboxed(clientjid, remoting.hostjid,
- remoting.accessCode);
+ remoting.plugin.connect(remoting.hostjid, "ACCESS_CODE",
+ clientjid, remoting.accessCode);
// TODO(ajwong): This should just be feedIq();
window.setTimeout(feedIq, 1000);
} else {
@@ -120,9 +120,11 @@ function init() {
// TODO(garykac): Clean exit if |connect| isn't a function.
if (typeof plugin.connect === 'function') {
if (remoting.connectMethod == 'sandboxed') {
+ plugin.setSandboxed(true);
registerConnection();
} else {
- plugin.connect(remoting.username, remoting.hostjid,
+ plugin.setSandboxed(false);
+ plugin.connect(remoting.hostjid, "ACCESS_CODE", remoting.username,
remoting.xmppAuthToken, remoting.accessCode);
}
} else {

Powered by Google App Engine
This is Rietveld 408576698