remoting/client/plugin/chromoting_scriptable_object.h - Issue 7069005: Revert 86573 - Add separate nonce version of connect calls to ChromotingScriptableObject.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/client/plugin/chromoting_scriptable_object.h

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 | « remoting/client/appengine/static_files/chromoting_session.js ('k') | remoting/client/plugin/chromoting_scriptable_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/client/plugin/chromoting_scriptable_object.h

===================================================================

--- remoting/client/plugin/chromoting_scriptable_object.h (revision 86574)

+++ remoting/client/plugin/chromoting_scriptable_object.h (working copy)

@@ -74,16 +74,12 @@

// // Methods for establishing a Chromoting connection.

// //

-// // When using the sandboxed versions, sendIq must be set and responses to

-// // calls on sendIq must be piped back into onIq().

-// void connect(string host_jid, string client_jid,

-// optional string access_code);

-// // Non-sandboxed version used for debugging/testing.

-// // TODO(garykac): Remove this version once we no longer need it.

-// void connectUnsandboxed(string host_jid, string username,

-// string xmpp_token, optional string access_code);

-//

-// // Terminating a Chromoting connection.

+// // Either use connect() or connectSandboxed(), not both. If using

+// // connectSandboxed(), sendIq must be set, and responses to calls on

+// // sendIq must be piped back into onIq().

+// void connect(string username, string host_jid, string auth_token,

+// string nonce);

+// void connectSandboxed(string your_jid, string host_jid, string nonce);

// void disconnect();

// // Method for submitting login information.

@@ -197,8 +193,8 @@

void SignalDesktopSizeChange();

pp::Var DoConnect(const std::vector<pp::Var>& args, pp::Var* exception);

- pp::Var DoConnectUnsandboxed(const std::vector<pp::Var>& args,

- pp::Var* exception);

+ pp::Var DoConnectSandboxed(const std::vector<pp::Var>& args,

+ pp::Var* exception);

pp::Var DoDisconnect(const std::vector<pp::Var>& args, pp::Var* exception);

// This method is called by JS to provide login information.