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

Unified Diff: remoting/client/appengine/static_files/chromoting_session.js

Issue 7069005: Revert 86573 - Add separate nonce version of connect calls to ChromotingScriptableObject. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- remoting/client/appengine/static_files/chromoting_session.js (revision 86574)
+++ remoting/client/appengine/static_files/chromoting_session.js (working copy)
@@ -54,7 +54,8 @@
var clientjid = xhr.responseText;
chromoting.plugin.sendIq = sendIq;
- chromoting.plugin.connect(chromoting.hostjid, clientjid);
+ // TODO:(jamiewalch): Pass in the correct nonce.
+ chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid);
// TODO(ajwong): This should just be feedIq();
window.setTimeout(feedIq, 1000);
} else {
@@ -131,8 +132,9 @@
if (chromoting.connectMethod == "sandboxed") {
registerConnection();
} else {
- plugin.connectUnsandboxed(chromoting.hostjid, chromoting.username,
- chromoting.talkToken);
+ // TODO:(jamiewalch): Pass in the correct nonce.
+ plugin.connect(chromoting.username, chromoting.hostjid,
+ 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