Chromium Code Reviews| 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 d623c32b110af9bef45b8a5977bd7fb20297feb3..8182c2489eea8c8975a83b16d2793ef219a6b3de 100644 |
| --- a/remoting/host/plugin/host_script_object.h |
| +++ b/remoting/host/plugin/host_script_object.h |
| @@ -16,7 +16,6 @@ |
| #include "base/threading/platform_thread.h" |
| #include "remoting/host/chromoting_host_context.h" |
| #include "remoting/host/host_status_observer.h" |
| -#include "remoting/host/plugin/host_plugin_logger.h" |
| #include "third_party/npapi/bindings/npapi.h" |
| #include "third_party/npapi/bindings/npfunctions.h" |
| #include "third_party/npapi/bindings/npruntime.h" |
| @@ -60,9 +59,6 @@ class HostNPScriptObject : public HostStatusObserver { |
| bool RemoveProperty(const std::string& property_name); |
| bool Enumerate(std::vector<std::string>* values); |
| - // Call LogDebugInfo handler if there is one. |
| - void LogDebugInfo(const std::string& message); |
| - |
| // remoting::HostStatusObserver implementation. |
| virtual void OnSignallingConnected(remoting::SignalStrategy* signal_strategy, |
| const std::string& full_jid) OVERRIDE; |
| @@ -71,6 +67,8 @@ class HostNPScriptObject : public HostStatusObserver { |
| virtual void OnAuthenticatedClientsChanged(int clients_connected) OVERRIDE; |
| virtual void OnShutdown() OVERRIDE; |
| + static bool LogToUI(int severity, const char* file, int line, |
|
dmac
2011/07/21 23:37:07
comment method please.
dmac
2011/07/21 23:37:07
severity is not an enum?
garykac
2011/08/02 00:15:37
defined in base/logging.h as an int.
garykac
2011/08/02 00:15:37
Done.
|
| + size_t message_start, const std::string& str); |
| private: |
| enum State { |
| kDisconnected, |
| @@ -92,6 +90,9 @@ class HostNPScriptObject : public HostStatusObserver { |
| // Call OnStateChanged handler if there is one. |
| void OnStateChanged(State state); |
| + // Call LogDebugInfo handler if there is one. |
| + void LogDebugInfo(const std::string& message); |
| + |
| // Callbacks invoked during session setup. |
| void OnReceivedSupportID(remoting::SupportAccessVerifier* access_verifier, |
| bool success, |
| @@ -131,8 +132,6 @@ class HostNPScriptObject : public HostStatusObserver { |
| NPObject* on_state_changed_func_; |
| base::PlatformThreadId np_thread_id_; |
| - scoped_ptr<HostPluginLogger> logger_; |
| - |
| scoped_ptr<RegisterSupportHostRequest> register_request_; |
| scoped_refptr<ChromotingHost> host_; |
| scoped_refptr<MutableHostConfig> host_config_; |