Chromium Code Reviews| Index: remoting/client/plugin/chromoting_instance.h |
| diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h |
| index 6d999c77bdcde60edefaf0d996f93f6aa0bebde9..ac9b2fd85ce2924db43ff5a88078c45ed7eb87ec 100644 |
| --- a/remoting/client/plugin/chromoting_instance.h |
| +++ b/remoting/client/plugin/chromoting_instance.h |
| @@ -19,7 +19,6 @@ |
| #include "ppapi/cpp/private/instance_private.h" |
| #include "remoting/client/client_context.h" |
| #include "remoting/client/plugin/chromoting_scriptable_object.h" |
| -#include "remoting/client/plugin/pepper_client_logger.h" |
| #include "remoting/protocol/connection_to_host.h" |
| class MessageLoop; |
| @@ -82,18 +81,19 @@ class ChromotingInstance : public pp::InstancePrivate { |
| // Called by ChromotingScriptableObject to set scale-to-fit. |
| void SetScaleToFit(bool scale_to_fit); |
| - void Log(int severity, const char* format, ...); |
| - void VLog(int verboselevel, const char* format, ...); |
| - |
| // Return statistics record by ChromotingClient. |
| // If no connection is currently active then NULL will be returned. |
| ChromotingStats* GetStats(); |
| void ReleaseAllKeys(); |
| + static bool LogToUI(int severity, const char* file, int line, |
|
dmac
2011/07/21 23:37:07
add a comment to the function please?
garykac
2011/08/02 00:15:37
Done.
|
| + size_t message_start, const std::string& str); |
| private: |
| FRIEND_TEST_ALL_PREFIXES(ChromotingInstanceTest, TestCaseSetup); |
| + void LogToUI_CorrectThread(const std::string& message); |
| + |
| bool initialized_; |
| ClientContext context_; |
| @@ -118,8 +118,6 @@ class ChromotingInstance : public pp::InstancePrivate { |
| // connection. |
| scoped_refptr<PepperXmppProxy> xmpp_proxy_; |
| - PepperClientLogger logger_; |
| - |
| // JavaScript interface to control this instance. |
| // This wraps a ChromotingScriptableObject in a pp::Var. |
| pp::Var instance_object_; |
| @@ -129,4 +127,6 @@ class ChromotingInstance : public pp::InstancePrivate { |
| } // namespace remoting |
| +DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::ChromotingInstance); |
|
dmac
2011/07/21 23:37:07
are we sure about this?
garykac
2011/08/02 00:15:37
I added a thread proxy class (stolen from Sergey's
|
| + |
| #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ |