Clean up client state callback.

remoting/client/plugin/chromoting_scriptable_object.cc

 // 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.
 
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 // TODO(wez): Remove this when crbug.com/86353 is complete.
 #include "ppapi/cpp/private/var_private.h"
@@ skipping 228 matching lines @@
     signal = true;
   }
 
   int error_index = property_names_[kErrorAttribute];
   if (properties_[error_index].attribute.AsInt() != error) {
     properties_[error_index].attribute = Var(error);
     signal = true;
   }
 
   if (signal)
-    SignalConnectionInfoChange();
+    SignalConnectionInfoChange(status, error);
 }
 
 void ChromotingScriptableObject::LogDebugInfo(const std::string& info) {
   Var exception;
   VarPrivate cb = GetProperty(Var(kDebugInfo), &exception);
 
   // Var() means call the object directly as a function rather than calling
   // a method in the object.
   cb.Call(Var(), Var(info), &exception);
 
@@ skipping 32 matching lines @@
   property_names_[name] = properties_.size();
   properties_.push_back(PropertyDescriptor(name, attribute));
 }
 
 void ChromotingScriptableObject::AddMethod(const std::string& name,
                                            MethodHandler handler) {
   property_names_[name] = properties_.size();
   properties_.push_back(PropertyDescriptor(name, handler));
 }
 
-void ChromotingScriptableObject::SignalConnectionInfoChange() {
+void ChromotingScriptableObject::SignalConnectionInfoChange(int status,
+                                                            int error) {
   plugin_message_loop_->PostTask(
       FROM_HERE, task_factory_.NewRunnableMethod(
-          &ChromotingScriptableObject::DoSignalConnectionInfoChange));
+          &ChromotingScriptableObject::DoSignalConnectionInfoChange,
+          status, error));
 }
 
 void ChromotingScriptableObject::SignalDesktopSizeChange() {
   plugin_message_loop_->PostTask(
       FROM_HERE, task_factory_.NewRunnableMethod(
           &ChromotingScriptableObject::DoSignalDesktopSizeChange));
 }
 
-void ChromotingScriptableObject::DoSignalConnectionInfoChange() {
+void ChromotingScriptableObject::DoSignalConnectionInfoChange(int status,
+                                                              int error) {
   Var exception;
   VarPrivate cb = GetProperty(Var(kConnectionInfoUpdate), &exception);
 
   // |this| must not be touched after Call() returns.
-  cb.Call(Var(), &exception);
+  cb.Call(Var(), Var(status), Var(error), &exception);

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

Will this work with an older version of the webapp that didn't have these
parameters?

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

Yes, I think so. Certainly the converse is true--if the caller is old and
doesn't provide these parameters then the function is still invoked; we test for
that case explicitly.

 
   if (!exception.is_undefined())
     LOG(ERROR) << "Exception when invoking connectionInfoUpdate JS callback.";
 }
 
 void ChromotingScriptableObject::DoSignalDesktopSizeChange() {
   Var exception;
   VarPrivate cb = GetProperty(Var(kDesktopSizeUpdate), &exception);
 
   // |this| must not be touched after Call() returns.
@@ skipping 114 matching lines @@
     const std::vector<pp::Var>& args, pp::Var* exception) {
   if (args.size() != 0) {
     *exception = Var("Usage: DoReleaseAllKeys()");
     return Var();
   }
   instance_->ReleaseAllKeys();
   return Var();
 }
 
 }  // namespace remoting