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

Unified Diff: remoting/client/appengine/static_files/chromoting_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 | « no previous file | remoting/client/plugin/chromoting_scriptable_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/appengine/static_files/chromoting_session.js
diff --git a/remoting/client/appengine/static_files/chromoting_session.js b/remoting/client/appengine/static_files/chromoting_session.js
index b6960dfedd0765e8682b53f47a8c29e2a248308e..8b9664244999755cb3f7ed6fc7daed4b8a643e16 100644
--- a/remoting/client/appengine/static_files/chromoting_session.js
+++ b/remoting/client/appengine/static_files/chromoting_session.js
@@ -54,8 +54,7 @@ function registerConnection() {
var clientjid = xhr.responseText;
chromoting.plugin.sendIq = sendIq;
- // TODO:(jamiewalch): Pass in the correct nonce.
- chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);
+ chromoting.plugin.connect(chromoting.hostjid, clientjid);
// TODO(ajwong): This should just be feedIq();
window.setTimeout(feedIq, 1000);
} else {
@@ -132,9 +131,8 @@ function init() {
if (chromoting.connectMethod == "sandboxed") {
registerConnection();
} else {
- // TODO:(jamiewalch): Pass in the correct nonce.
- plugin.connect(chromoting.username, chromoting.hostjid,
- chromoting.talkToken, '');
+ plugin.connectUnsandboxed(chromoting.hostjid, chromoting.username,
+ chromoting.talkToken);
}
} else {
addToDebugLog('ERROR: chromoting plugin not loaded');
« no previous file with comments | « no previous file | remoting/client/plugin/chromoting_scriptable_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698