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 b67097ab74dbac52706617d92177a2081538bf4b..12f8703cb6e9f8008937e80ec289790acc7b4a3f 100644 |
| --- a/remoting/host/plugin/host_script_object.h |
| +++ b/remoting/host/plugin/host_script_object.h |
| @@ -80,11 +80,10 @@ class HostNPScriptObject : public HostStatusObserver { |
| remoting::protocol::ConnectionToClient* client) OVERRIDE; |
| virtual void OnShutdown() OVERRIDE; |
| - // A Log Message Handler that is called after each LOG message has been |
| - // processed. This must be of type LogMessageHandlerFunction defined in |
| - // base/logging.h. |
| - static bool LogToUI(int severity, const char* file, int line, |
| - size_t message_start, const std::string& str); |
| + // Post LogDebugInfo to the correct proxy (and thus, on the correct thread). |
| + // This should only be called by HostLogHandler. To log to the UI, use the |
| + // standard LOG(INFO) and it will be sent to this method. |
| + void PostLogDebugInfo(const std::string& message); |
| private: |
| enum State { |
| @@ -114,6 +113,7 @@ class HostNPScriptObject : public HostStatusObserver { |
| void OnStateChanged(State state); |
| // Call LogDebugInfo handler if there is one. |
| + // This must be called on the correct thread. |
| void LogDebugInfo(const std::string& message); |
| // Callbacks invoked during session setup. |
| @@ -180,6 +180,9 @@ class HostNPScriptObject : public HostStatusObserver { |
| base::WaitableEvent disconnected_event_; |
| + // True if we're in the middle of handling a log message. |
| + bool currently_logging_; |
|
Wez
2011/09/01 01:21:23
nit: Should technically be am_currently_logging_?
garykac
2011/09/01 01:30:55
Done.
|
| + |
| scoped_ptr<policy_hack::NatPolicy> nat_policy_; |
| // Host the current nat traversal policy setting. |
| @@ -201,4 +204,4 @@ class HostNPScriptObject : public HostStatusObserver { |
| DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::HostNPScriptObject); |
| -#endif // REMOTING_HOST_HOST_SCRIPT_OBJECT_H_ |
| +#endif // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ |