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

Unified Diff: remoting/protocol/host_message_dispatcher.cc

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Resolve merge conflicts Created 10 years, 1 month 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/protocol/host_message_dispatcher.h ('k') | remoting/protocol/jingle_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/host_message_dispatcher.cc
diff --git a/remoting/protocol/host_message_dispatcher.cc b/remoting/protocol/host_message_dispatcher.cc
index 5406813e792f675afbedd83fb624b687430a4d83..d75de95e197c22a99929ec16d28497c09a66c669 100644
--- a/remoting/protocol/host_message_dispatcher.cc
+++ b/remoting/protocol/host_message_dispatcher.cc
@@ -6,12 +6,11 @@
#include "remoting/base/multiple_array_input_stream.h"
#include "remoting/proto/control.pb.h"
#include "remoting/proto/event.pb.h"
-#include "remoting/proto/video.pb.h"
-#include "remoting/protocol/chromotocol_connection.h"
#include "remoting/protocol/host_message_dispatcher.h"
#include "remoting/protocol/host_stub.h"
#include "remoting/protocol/input_stub.h"
#include "remoting/protocol/message_reader.h"
+#include "remoting/protocol/session.h"
namespace {
@@ -52,10 +51,10 @@ HostMessageDispatcher::~HostMessageDispatcher() {
}
bool HostMessageDispatcher::Initialize(
- ChromotocolConnection* connection,
+ protocol::Session* session,
HostStub* host_stub, InputStub* input_stub) {
- if (!connection || !host_stub || !input_stub ||
- !connection->event_channel() || !connection->control_channel()) {
+ if (!session || !host_stub || !input_stub ||
+ !session->event_channel() || !session->control_channel()) {
return false;
}
@@ -66,10 +65,10 @@ bool HostMessageDispatcher::Initialize(
// Initialize the readers on the sockets provided by channels.
event_message_reader_->Init<EventMessage>(
- connection->event_channel(),
+ session->event_channel(),
NewCallback(this, &HostMessageDispatcher::OnEventMessageReceived));
control_message_reader_->Init<ControlMessage>(
- connection->control_channel(),
+ session->control_channel(),
NewCallback(this, &HostMessageDispatcher::OnControlMessageReceived));
return true;
}
« no previous file with comments | « remoting/protocol/host_message_dispatcher.h ('k') | remoting/protocol/jingle_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698