summaryrefslogtreecommitdiffstats
path: root/remoting/host/chromoting_host.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:46:01 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:46:01 +0000
commitd87c404738c7c89968ee01353d71d3a31f91669f (patch)
tree91e581d1d29cbcb64f22634961bb212b674ed1c7 /remoting/host/chromoting_host.h
parentde9bdd1e4d2f87f53b1c2d3eacfbe43ef6ca1019 (diff)
downloadchromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.zip
chromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.tar.gz
chromium_src-d87c404738c7c89968ee01353d71d3a31f91669f.tar.bz2
Move protocol classes to the remoting::protocol namespace
BUG=None TEST=compiles Review URL: http://codereview.chromium.org/4233005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host.h')
-rw-r--r--remoting/host/chromoting_host.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index b091cb3..04b0d2b 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -56,7 +56,7 @@ class SessionManager;
// return to the idle state. We then go to step (2) if there a new
// incoming connection.
class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
- public ClientConnection::EventHandler,
+ public protocol::ClientConnection::EventHandler,
public JingleClient::Callback {
public:
ChromotingHost(ChromotingHostContext* context, MutableHostConfig* config,
@@ -78,18 +78,18 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
void Shutdown();
// This method is called if a client is connected to this object.
- void OnClientConnected(ClientConnection* client);
+ void OnClientConnected(protocol::ClientConnection* client);
// This method is called if a client is disconnected from the host.
- void OnClientDisconnected(ClientConnection* client);
+ void OnClientDisconnected(protocol::ClientConnection* client);
////////////////////////////////////////////////////////////////////////////
- // ClientConnection::EventHandler implementations
- virtual void HandleMessage(ClientConnection* client,
+ // protocol::ClientConnection::EventHandler implementations
+ virtual void HandleMessage(protocol::ClientConnection* client,
ChromotingClientMessage* message);
- virtual void OnConnectionOpened(ClientConnection* client);
- virtual void OnConnectionClosed(ClientConnection* client);
- virtual void OnConnectionFailed(ClientConnection* client);
+ virtual void OnConnectionOpened(protocol::ClientConnection* client);
+ virtual void OnConnectionClosed(protocol::ClientConnection* client);
+ virtual void OnConnectionFailed(protocol::ClientConnection* client);
////////////////////////////////////////////////////////////////////////////
// JingleClient::Callback implementations
@@ -145,7 +145,7 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
// A ClientConnection manages the connectino to a remote client.
// TODO(hclam): Expand this to a list of clients.
- scoped_refptr<ClientConnection> client_;
+ scoped_refptr<protocol::ClientConnection> client_;
// Session manager for the host process.
scoped_refptr<SessionManager> session_;