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).
@@ skipping 102 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 {
+    // TODO(jamiewalch): Remove STATUS_UNKNOWN once all web-apps that might try
+    // to access it have been upgraded.
     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_