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

Unified Diff: remoting/host/client_connection.cc

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts Created 10 years, 4 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/host/client_connection.h ('k') | remoting/host/event_executor_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_connection.cc
diff --git a/remoting/host/client_connection.cc b/remoting/host/client_connection.cc
index 6c8516a1dac01891d264037eb64d33cb0f40e49a..b6e875998c615856b40bd13e162720ff09a62096 100644
--- a/remoting/host/client_connection.cc
+++ b/remoting/host/client_connection.cc
@@ -38,10 +38,10 @@ ClientConnection::~ClientConnection() {
// static
scoped_refptr<media::DataBuffer>
ClientConnection::CreateWireFormatDataBuffer(
- const HostMessage* msg) {
+ const ChromotingHostMessage* msg) {
// TODO(hclam): Instead of serializing |msg| create an DataBuffer
// object that wraps around it.
- scoped_ptr<const HostMessage> message_deleter(msg);
+ scoped_ptr<const ChromotingHostMessage> message_deleter(msg);
return SerializeAndFrameMessage(*msg);
}
@@ -53,7 +53,7 @@ void ClientConnection::SendInitClientMessage(int width, int height) {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_init_client()->set_width(width);
msg.mutable_init_client()->set_height(height);
DCHECK(msg.IsInitialized());
@@ -67,7 +67,7 @@ void ClientConnection::SendBeginUpdateStreamMessage() {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_begin_update_stream();
DCHECK(msg.IsInitialized());
@@ -96,7 +96,7 @@ void ClientConnection::SendEndUpdateStreamMessage() {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_end_update_stream();
DCHECK(msg.IsInitialized());
« no previous file with comments | « remoting/host/client_connection.h ('k') | remoting/host/event_executor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698