Clean up client state callback.

remoting/client/plugin/chromoting_scriptable_object.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This implements the JavaScript class entrypoint for the plugin instance.
 // The Javascript API is defined as follows.
 //
 // interface ChromotingScriptableObject {
 //
 //   // Chromoting session API version (for this plugin).
 //   // This is compared with the javascript API version to verify that they are
 //   // compatible.
 //   readonly attribute unsigned short apiVersion;
 //
 //   // The oldest API version that we support.
 //   // This will differ from |apiVersion| if we decide to maintain backward
 //   // compatibility with older API versions.
 //   readonly attribute unsigned short apiMinVersion;
 //
 //   // Connection status.
 //   readonly attribute unsigned short status;
 //
 //   // Constants for connection status.
 //   const unsigned short STATUS_UNKNOWN;

[Sergey Ulanov, 2011/11/16 23:08:12]

Since these values are not used anymore can we remove them from the interface?
Same question regarding status and error properties.
We probably want to keep them for backward compatibility between the webapp and
the plugin. Maybe add TODO to remove them in the future?

[Jamie, 2011/11/17 22:06:18]

Done.

 //   const unsigned short STATUS_CONNECTING;
 //   const unsigned short STATUS_INITIALIZING;
 //   const unsigned short STATUS_CONNECTED;
 //   const unsigned short STATUS_CLOSED;
 //   const unsigned short STATUS_FAILED;
 //
 //   // Constants for connection errors.
 //   const unsigned short ERROR_NONE;
 //   const unsigned short ERROR_HOST_IS_OFFLINE;
 //   const unsigned short ERROR_SESSION_REJECTED;
@@ skipping 78 matching lines @@
 
 namespace remoting {
 
 class ChromotingInstance;
 class PepperXmppProxy;
 
 class ChromotingScriptableObject
     : public pp::deprecated::ScriptableObject,
       public base::SupportsWeakPtr<ChromotingScriptableObject> {
  public:
+  // These state values are duplicated in the JS code. Remember to update both
+  // copies when making changes.
   enum ConnectionStatus {
     STATUS_UNKNOWN = 0,
     STATUS_CONNECTING,
     STATUS_INITIALIZING,
     STATUS_CONNECTED,
     STATUS_CLOSED,
     STATUS_FAILED,
   };
 
+  // These state values are duplicated in the JS code. Remember to update both
+  // copies when making changes.
   enum ConnectionError {
     ERROR_NONE = 0,
     ERROR_HOST_IS_OFFLINE,
     ERROR_SESSION_REJECTED,
     ERROR_INCOMPATIBLE_PROTOCOL,
     ERROR_NETWORK_FAILURE,
   };
 
   ChromotingScriptableObject(
       ChromotingInstance* instance,
@@ skipping 48 matching lines @@
 
     std::string name;
     pp::Var attribute;
     MethodHandler method;
   };
 
   // Routines to add new attribute, method properties.
   void AddAttribute(const std::string& name, pp::Var attribute);
   void AddMethod(const std::string& name, MethodHandler handler);
 
-  void SignalConnectionInfoChange();
+  void SignalConnectionInfoChange(int status, int error);
   void SignalDesktopSizeChange();
 
   // Calls to these methods are posted to the plugin thread so that we
   // call JavaScript with clean stack. This is necessary because
   // JavaScript event handlers may destroy the plugin.
-  void DoSignalConnectionInfoChange();
+  void DoSignalConnectionInfoChange(int status, int error);
   void DoSignalDesktopSizeChange();
   void DoSendIq(const std::string& message_xml);
 
   pp::Var DoConnect(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 set scale-to-fit.
   pp::Var DoSetScaleToFit(const std::vector<pp::Var>& args, pp::Var* exception);
 
   // This method is called by Javascript to provide responses to sendIq()
@@ skipping 13 matching lines @@
 
   scoped_refptr<base::MessageLoopProxy> plugin_message_loop_;
   ScopedRunnableMethodFactory<ChromotingScriptableObject> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingScriptableObject);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_SCRIPTABLE_OBJECT_H_