Index: remoting/client/plugin/chromoting_scriptable_object.h |
diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h |
index 8ee2d12ff8d047e10415ed426365aa9fb05ea5c4..335cf8ba45fd44b0b26ef9693e474220217ba109 100644 |
--- a/remoting/client/plugin/chromoting_scriptable_object.h |
+++ b/remoting/client/plugin/chromoting_scriptable_object.h |
@@ -77,9 +77,11 @@ |
// // 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 connect(string username, string host_jid, string auth_token); |
+// void connectNonce(string username, string host_jid, string auth_token, |
Jamie
2011/05/19 00:16:52
Can you clean up some of the terminology to refer
garykac
2011/05/20 01:33:02
Switched to using |access_code|.
|
+// string nonce); |
+// void connectSandboxed(string your_jid, string host_jid); |
+// void connectSandboxedNonce(string your_jid, string host_jid, string nonce); |
// void disconnect(); |
// |
// // Method for submitting login information. |
@@ -193,8 +195,19 @@ class ChromotingScriptableObject |
void SignalDesktopSizeChange(); |
pp::Var DoConnect(const std::vector<pp::Var>& args, pp::Var* exception); |
+ pp::Var DoConnectNonce(const std::vector<pp::Var>& args, pp::Var* exception); |
+ pp::Var DoConnect_(const std::vector<pp::Var>& args, |
awong
2011/05/19 00:13:31
This trailing _ seems odd. Can we rename it somet
garykac
2011/05/20 01:33:02
Oh sure, Jamie can get away with naming things lik
|
+ pp::Var* exception, |
+ bool require_nonce); |
+ |
pp::Var DoConnectSandboxed(const std::vector<pp::Var>& args, |
pp::Var* exception); |
+ pp::Var DoConnectSandboxedNonce(const std::vector<pp::Var>& args, |
+ pp::Var* exception); |
+ pp::Var DoConnectSandboxed_(const std::vector<pp::Var>& args, |
awong
2011/05/19 00:13:31
Same here. Also indentation.
garykac
2011/05/20 01:33:02
Done.
|
+ pp::Var* exception, |
+ bool require_nonce); |
+ |
pp::Var DoDisconnect(const std::vector<pp::Var>& args, pp::Var* exception); |
// This method is called by JS to provide login information. |