Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Unified Diff: remoting/host/chromoting_host.h

Issue 7262015: Conenct Chromoting plugin debug log to JS UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/pepper_client_logger.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.h
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 709a2acec735c89ec14c1cd0f870c21eb0c3883c..0bbfe7f162539eb9bc120be059ed9c8f73148358 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -36,6 +36,7 @@ class Capturer;
class ChromotingHostContext;
class DesktopEnvironment;
class Encoder;
+class Logger;
class MutableHostConfig;
class ScreenRecorder;
@@ -73,11 +74,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.
//
@@ -118,6 +121,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,
@@ -152,7 +157,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 {
@@ -199,6 +205,9 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
scoped_ptr<AccessVerifier> access_verifier_;
+ // Logger (owned by the HostNPScriptObject).
+ Logger* logger_;
+
// The connections to remote clients.
ClientList clients_;
« no previous file with comments | « remoting/client/plugin/pepper_client_logger.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698