diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 06:50:54 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 06:50:54 +0000 |
| commit | 72308ecf6d57b3f760cf776e5e544b5d7b3e3589 (patch) | |
| tree | 42f0e8a5847b2afa27a12849c27fb5cc5592bae6 /remoting/client/plugin/chromoting_scriptable_object.h | |
| parent | 6e3410aef5015c1ced049802fd2dc1e06e822a03 (diff) | |
| download | chromium_src-72308ecf6d57b3f760cf776e5e544b5d7b3e3589.zip chromium_src-72308ecf6d57b3f760cf776e5e544b5d7b3e3589.tar.gz chromium_src-72308ecf6d57b3f760cf776e5e544b5d7b3e3589.tar.bz2 | |
Revert 86573 - Add separate nonce version of connect calls to ChromotingScriptableObject.
It causes PPAPITest.Transport failure on Vista
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/7042022
TBR=garykac@chromium.org
Review URL: http://codereview.chromium.org/7069005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin/chromoting_scriptable_object.h')
| -rw-r--r-- | remoting/client/plugin/chromoting_scriptable_object.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index 9c8545b..8ee2d12f 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -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 @@ class ChromotingScriptableObject 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. |