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..8bc0130d63e66b26ea45fe080968e3a4e2f3eb81 100644 |
--- a/remoting/client/plugin/chromoting_scriptable_object.h |
+++ b/remoting/client/plugin/chromoting_scriptable_object.h |
@@ -7,28 +7,9 @@ |
// |
// interface ChromotingScriptableObject { |
// |
-// // Dimension of the desktop area. |
-// readonly attribute int desktopWidth; |
-// readonly attribute int desktopHeight; |
-// |
// // Connection status. |
// readonly attribute unsigned short status; |
// |
-// // Statistics. |
-// // Video Bandwidth in bytes per second. |
-// readonly attribute float videoBandwidth; |
-// // Latency for capturing in milliseconds. |
-// readonly attribute int videoCaptureLatency; |
-// // Latency for video encoding in milliseconds. |
-// readonly attribute int videoEncodeLatency; |
-// // Latency for video decoding in milliseconds. |
-// readonly attribute int videoDecodeLatency; |
-// // Latency for rendering in milliseconds. |
-// readonly attribute int videoRenderLatency; |
-// // Latency between an event is sent and a corresponding video packet is |
-// // received. |
-// readonly attribute int roundTripLatency; |
-// |
// // Constants for connection status. |
// const unsigned short STATUS_UNKNOWN = 0; |
// const unsigned short STATUS_CONNECTING = 1; |
@@ -39,6 +20,7 @@ |
// |
// // Connection quality. |
// readonly attribute unsigned short quality; |
+// |
// // Constants for connection quality |
// const unsigned short QUALITY_UNKNOWN = 0; |
// const unsigned short QUALITY_GOOD = 1; |
@@ -52,14 +34,7 @@ |
// // in the client UI. |
// attribute Function debugInfo; |
// |
-// // JS callback function to send an XMPP IQ stanza for performing the |
-// // signaling in a jingle connection. The callback function should be |
-// // of type void(string request_xml). |
-// attribute Function sendIq; |
-// |
-// // Method for receiving an XMPP IQ stanza in response to a previous |
-// // sendIq() invocation. Other packets will be silently dropped. |
-// void onIq(string response_xml); |
+// attribute Function desktopSizeUpdate; |
// |
// // This function is called when login information for the host machine is |
// // needed. |
@@ -72,6 +47,30 @@ |
// // later case |connection_status| is changed to STATUS_FAILED. |
// attribute Function loginChallenge; |
// |
+// // JS callback function to send an XMPP IQ stanza for performing the |
+// // signaling in a jingle connection. The callback function should be |
+// // of type void(string request_xml). |
+// attribute Function sendIq; |
+// |
+// // Dimension of the desktop area. |
+// readonly attribute int desktopWidth; |
+// readonly attribute int desktopHeight; |
+// |
+// // Statistics. |
+// // Video Bandwidth in bytes per second. |
+// readonly attribute float videoBandwidth; |
+// // Latency for capturing in milliseconds. |
+// readonly attribute int videoCaptureLatency; |
+// // Latency for video encoding in milliseconds. |
+// readonly attribute int videoEncodeLatency; |
+// // Latency for video decoding in milliseconds. |
+// readonly attribute int videoDecodeLatency; |
+// // Latency for rendering in milliseconds. |
+// readonly attribute int videoRenderLatency; |
+// // Latency between an event is sent and a corresponding video packet is |
+// // received. |
+// readonly attribute int roundTripLatency; |
+// |
// // Methods for establishing a Chromoting connection. |
// // |
// // Either use connect() or connectSandboxed(), not both. If using |
@@ -87,6 +86,10 @@ |
// |
// // Method for setting scale-to-fit. |
// void setScaleToFit(bool scale_to_fit); |
+// |
+// // Method for receiving an XMPP IQ stanza in response to a previous |
+// // sendIq() invocation. Other packets will be silently dropped. |
+// void onIq(string response_xml); |
// } |
#ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_SCRIPTABLE_OBJECT_H_ |
@@ -151,7 +154,7 @@ class ChromotingScriptableObject |
void SignalLoginChallenge(); |
// Attaches the XmppProxy used for issuing and receivng IQ stanzas for |
- // initiaing a jingle connection from within the sandbox. |
+ // initializing a jingle connection from within the sandbox. |
void AttachXmppProxy(PepperXmppProxy* xmpp_proxy); |
// Sends an IQ stanza, serialized as an xml string, into Javascript for |