Index: remoting/host/plugin/host_script_object.h |
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h |
index 03d14c32c32540bb39b95a67ab367cd0bba428af..bd37b48883d59444967f0389d71aa83ce1f4e2ff 100644 |
--- a/remoting/host/plugin/host_script_object.h |
+++ b/remoting/host/plugin/host_script_object.h |
@@ -15,6 +15,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/platform_thread.h" |
#include "base/time.h" |
+#include "remoting/base/plugin_message_loop_proxy.h" |
#include "remoting/host/chromoting_host_context.h" |
#include "remoting/host/host_status_observer.h" |
#include "third_party/npapi/bindings/npapi.h" |
@@ -40,7 +41,8 @@ class SupportAccessVerifier; |
// destroyed it sychronously shuts down the host and all threads. |
class HostNPScriptObject : public HostStatusObserver { |
public: |
- HostNPScriptObject(NPP plugin, NPObject* parent); |
+ HostNPScriptObject(NPP plugin, NPObject* parent, |
+ PluginMessageLoopProxy::Delegate* plugin_thread_delegate); |
virtual ~HostNPScriptObject(); |
bool Init(); |
@@ -121,13 +123,6 @@ class HostNPScriptObject : public HostStatusObserver { |
const NPVariant* args, |
uint32_t argCount); |
- // Posts a task on the main NP thread. |
- void PostTaskToNPThread( |
- const tracked_objects::Location& from_here, const base::Closure& task); |
- |
- // Utility function for PostTaskToNPThread. |
- static void NPTaskSpringboard(void* task); |
- |
// Set an exception for the current call. |
void SetException(const std::string& exception_string); |
@@ -140,6 +135,7 @@ class HostNPScriptObject : public HostStatusObserver { |
NPObject* log_debug_info_func_; |
NPObject* on_state_changed_func_; |
base::PlatformThreadId np_thread_id_; |
+ scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_proxy_; |
scoped_ptr<RegisterSupportHostRequest> register_request_; |
scoped_refptr<MutableHostConfig> host_config_; |
@@ -150,7 +146,6 @@ class HostNPScriptObject : public HostStatusObserver { |
int failed_login_attempts_; |
base::WaitableEvent disconnected_event_; |
- base::CancellationFlag destructing_; |
}; |
} // namespace remoting |