Windows chromoting host installation via the NPAPI plugin

remoting/host/plugin/host_script_object.cc

Index: remoting/host/plugin/host_script_object.cc
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 2cbca57a350f231d07493c8f94797365cbac5007..08782a0aa3769258361f1c7d78a90343fffea05b 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -57,6 +57,7 @@ const char* kFuncNameGetDaemonConfig = "getDaemonConfig";
 const char* kFuncNameGetDaemonVersion = "getDaemonVersion";
 const char* kFuncNameGetPairedClients = "getPairedClients";
 const char* kFuncNameGetUsageStatsConsent = "getUsageStatsConsent";
+const char* kFuncNameInstallHost = "installHost";
 const char* kFuncNameStartDaemon = "startDaemon";
 const char* kFuncNameStopDaemon = "stopDaemon";
 
@@ -153,6 +154,7 @@ bool HostNPScriptObject::HasMethod(const std::string& method_name) {
           method_name == kFuncNameGetDaemonVersion ||
           method_name == kFuncNameGetPairedClients ||
           method_name == kFuncNameGetUsageStatsConsent ||
+          method_name == kFuncNameInstallHost ||

[Jamie, 2014/04/10 18:29:32]

Should this be available only on Windows?

[weitao, 2014/04/10 21:33:47]

It doesn't matter as the NPAPI plugin will soon be removed from the Mac/Linux
build. Currently Mac and Linux has a dummy implementation that is unreachable.

On 2014/04/10 18:29:32, Jamie wrote:

           method_name == kFuncNameStartDaemon ||
           method_name == kFuncNameStopDaemon);
 }
@@ -198,6 +200,8 @@ bool HostNPScriptObject::Invoke(const std::string& method_name,
     return GetPairedClients(args, arg_count, result);
   } else if (method_name == kFuncNameGetUsageStatsConsent) {
     return GetUsageStatsConsent(args, arg_count, result);
+  } else if (method_name == kFuncNameInstallHost) {
+    return InstallHost(args, arg_count, result);
   } else if (method_name == kFuncNameStartDaemon) {
     return StartDaemon(args, arg_count, result);
   } else if (method_name == kFuncNameStopDaemon) {
@@ -433,6 +437,7 @@ bool HostNPScriptObject::Enumerate(std::vector<std::string>* values) {
     kFuncNameGetDaemonVersion,
     kFuncNameGetPairedClients,
     kFuncNameGetUsageStatsConsent,
+    kFuncNameInstallHost,
     kFuncNameStartDaemon,
     kFuncNameStopDaemon
   };
@@ -802,6 +807,29 @@ bool HostNPScriptObject::GetUsageStatsConsent(const NPVariant* args,
   return true;
 }
 
+bool HostNPScriptObject::InstallHost(const NPVariant* args,
+                                     uint32_t arg_count,
+                                     NPVariant* result) {
+  DCHECK(plugin_task_runner_->BelongsToCurrentThread());
+
+  if (arg_count != 1) {
+    SetException("startDaemon: bad number of arguments");

[Jamie, 2014/04/10 18:29:32]

s/startDaemon/installHost/ (here and below)

[weitao, 2014/04/10 21:33:47]

Done.

+    return false;
+  }
+
+  scoped_ptr<ScopedRefNPObject> callback_obj(
+      new ScopedRefNPObject(ObjectFromNPVariant(args[0])));
+  if (!callback_obj->get()) {
+    SetException("startDaemon: invalid callback parameter");
+    return false;
+  }
+
+  daemon_controller_->InstallHost(
+      base::Bind(&HostNPScriptObject::InvokeAsyncResultCallback, weak_ptr_,
+                 base::Passed(&callback_obj)));
+  return true;
+}
+
 bool HostNPScriptObject::StartDaemon(const NPVariant* args,
                                      uint32_t arg_count,
                                      NPVariant* result) {