Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1279)

Unified Diff: remoting/host/plugin/host_script_object.cc

Issue 232223003: Windows chromoting host installation via the NPAPI plugin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unittests Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/plugin/host_script_object.h ('k') | remoting/host/setup/daemon_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6acb7362a5a8f10a9ad200beed928294204542b4 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 ||
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("installHost: bad number of arguments");
+ return false;
+ }
+
+ scoped_ptr<ScopedRefNPObject> callback_obj(
+ new ScopedRefNPObject(ObjectFromNPVariant(args[0])));
+ if (!callback_obj->get()) {
+ SetException("installHost: 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) {
« no previous file with comments | « remoting/host/plugin/host_script_object.h ('k') | remoting/host/setup/daemon_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698