summaryrefslogtreecommitdiffstats
path: root/remoting/host/chromoting_host.cc
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.cc
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.cc')
-rw-r--r--remoting/host/chromoting_host.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 4a75d52..89389a6 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -134,7 +134,7 @@ void ChromotingHost::Shutdown() {
}
// This method is called if a client is connected to this object.
-void ChromotingHost::OnClientConnected(ClientConnection* client) {
+void ChromotingHost::OnClientConnected(protocol::ClientConnection* client) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
// Create a new RecordSession if there was none.
@@ -158,7 +158,7 @@ void ChromotingHost::OnClientConnected(ClientConnection* client) {
VLOG(1) << "Session manager started";
}
-void ChromotingHost::OnClientDisconnected(ClientConnection* client) {
+void ChromotingHost::OnClientDisconnected(protocol::ClientConnection* client) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
// Remove the client from the session manager and pause the session.
@@ -176,8 +176,8 @@ void ChromotingHost::OnClientDisconnected(ClientConnection* client) {
}
////////////////////////////////////////////////////////////////////////////
-// ClientConnection::EventHandler implementations
-void ChromotingHost::HandleMessage(ClientConnection* client,
+// protocol::ClientConnection::EventHandler implementations
+void ChromotingHost::HandleMessage(protocol::ClientConnection* client,
ChromotingClientMessage* message) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
@@ -187,7 +187,7 @@ void ChromotingHost::HandleMessage(ClientConnection* client,
executor_->HandleInputEvent(message);
}
-void ChromotingHost::OnConnectionOpened(ClientConnection* client) {
+void ChromotingHost::OnConnectionOpened(protocol::ClientConnection* client) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
// Completes the client connection.
@@ -195,14 +195,14 @@ void ChromotingHost::OnConnectionOpened(ClientConnection* client) {
OnClientConnected(client_.get());
}
-void ChromotingHost::OnConnectionClosed(ClientConnection* client) {
+void ChromotingHost::OnConnectionClosed(protocol::ClientConnection* client) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
VLOG(1) << "Connection to client closed.";
OnClientDisconnected(client_.get());
}
-void ChromotingHost::OnConnectionFailed(ClientConnection* client) {
+void ChromotingHost::OnConnectionFailed(protocol::ClientConnection* client) {
DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
LOG(ERROR) << "Connection failed unexpectedly.";
@@ -281,7 +281,7 @@ void ChromotingHost::OnNewClientSession(
// If we accept the connected then create a client object and set the
// callback.
- client_ = new ClientConnection(context_->main_message_loop(), this);
+ client_ = new protocol::ClientConnection(context_->main_message_loop(), this);
client_->Init(session);
}
@@ -308,5 +308,4 @@ Encoder* ChromotingHost::CreateEncoder(const ChromotocolConfig* config) {
return NULL;
}
-
} // namespace remoting