Chromium Code Reviews| Index: remoting/host/chromoting_host.h |
| diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h |
| index 6f969d4e73469cd296a87e491086cb34ad7bffe2..875c0ca525e4f06b6fedd38bfef9b793e6a4f1ec 100644 |
| --- a/remoting/host/chromoting_host.h |
| +++ b/remoting/host/chromoting_host.h |
| @@ -37,6 +37,7 @@ class Capturer; |
| class ChromotingHostContext; |
| class DesktopEnvironment; |
| class Encoder; |
| +class Logger; |
| class MutableHostConfig; |
| class ScreenRecorder; |
| @@ -74,11 +75,13 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, |
| // and adds a reference to |config|. It does NOT take ownership of |context|. |
| static ChromotingHost* Create(ChromotingHostContext* context, |
| MutableHostConfig* config, |
| - AccessVerifier* access_verifier); |
| + AccessVerifier* access_verifier, |
| + Logger* logger); |
| static ChromotingHost* Create(ChromotingHostContext* context, |
| MutableHostConfig* config, |
| DesktopEnvironment* environment, |
| - AccessVerifier* access_verifier); |
| + AccessVerifier* access_verifier, |
| + Logger* logger); |
| // Asynchronously start the host process. |
| // |
| @@ -117,6 +120,8 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, |
| virtual void LocalLoginFailed( |
| scoped_refptr<protocol::ConnectionToClient> client); |
| + Logger* logger() { return logger_; } |
| + |
| // Callback for ChromotingServer. |
| void OnNewClientSession( |
| protocol::Session* session, |
| @@ -151,7 +156,8 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, |
| ChromotingHost(ChromotingHostContext* context, |
| MutableHostConfig* config, |
| DesktopEnvironment* environment, |
| - AccessVerifier* access_verifier); |
| + AccessVerifier* access_verifier, |
| + Logger* logger); |
| virtual ~ChromotingHost(); |
| enum State { |
| @@ -214,6 +220,9 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>, |
| scoped_ptr<AccessVerifier> access_verifier_; |
| + // Logger (not owned). |
| + Logger* logger_; |
|
dmac
2011/06/26 14:34:44
Chromoting host takes ownership of everything else
garykac
2011/06/27 21:24:20
Unlike the other params, the logger is part of the
|
| + |
| // The connections to remote clients. |
| ClientList clients_; |