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

Unified Diff: remoting/base/encoder.h

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/base/decoder_zlib.cc ('k') | remoting/base/encoder_verbatim.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/encoder.h
diff --git a/remoting/base/encoder.h b/remoting/base/encoder.h
index 0c1fd50f5583e64af4edc09b7cb1d85cd20155d0..4d2cf852309ab8fedf51eb3e6546ebb9383c226f 100644
--- a/remoting/base/encoder.h
+++ b/remoting/base/encoder.h
@@ -17,7 +17,6 @@ namespace media {
namespace remoting {
class CaptureData;
-class HostMessage;
// A class to perform the task of encoding a continous stream of
// images.
@@ -40,7 +39,8 @@ class Encoder {
// of HostMessage to reduce the amount of memory copies.
// The callback takes ownership of the HostMessage and is responsible for
// deleting it.
- typedef Callback2<HostMessage*, EncodingState>::Type DataAvailableCallback;
+ typedef Callback2<ChromotingHostMessage*,
+ EncodingState>::Type DataAvailableCallback;
virtual ~Encoder() {}
« no previous file with comments | « remoting/base/decoder_zlib.cc ('k') | remoting/base/encoder_verbatim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698