summaryrefslogtreecommitdiffstats
path: root/remoting/host/session_manager.h
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:56:39 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:56:39 +0000
commitef0a59a6fd722a0910196c951dc676c19127a28b (patch)
tree9d90ab9227e4222fa312dadae114c8d2247028bf /remoting/host/session_manager.h
parente9fdd159ffd94e3e097bd6905d84e6b564b04c2c (diff)
downloadchromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.zip
chromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.tar.gz
chromium_src-ef0a59a6fd722a0910196c951dc676c19127a28b.tar.bz2
Implement a chromoting client using X11
Using XRender to render the chromoting client. This patch has done several things: 1. Rename chromotocol_pb to remoting 2. Defined ChromotingView as the display area of the remote view 3. Implemented X11Client as the client that uses X11 for display 4. Implemented X11View that uses XRender for drawing 5. Fixed several problems in host capturer and encoder Review URL: http://codereview.chromium.org/2745006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/session_manager.h')
-rw-r--r--remoting/host/session_manager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/session_manager.h b/remoting/host/session_manager.h
index 2a88020..677e3bd 100644
--- a/remoting/host/session_manager.h
+++ b/remoting/host/session_manager.h
@@ -104,7 +104,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {
void DoFinishEncode();
void DoEncode();
void DoSendUpdate(
- chromotocol_pb::UpdateStreamPacketHeader* header,
+ UpdateStreamPacketHeader* header,
scoped_refptr<media::DataBuffer> encoded_data,
bool begin_update,
bool end_update);
@@ -168,11 +168,11 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> {
int capture_data_strides_[3];
int capture_width_;
int capture_height_;
- chromotocol_pb::PixelFormat capture_pixel_format_;
+ PixelFormat capture_pixel_format_;
// The following members are accessed on the encode thread.
// Output parameter written by Encoder to carry encoded data.
- chromotocol_pb::UpdateStreamPacketHeader encoded_data_header_;
+ UpdateStreamPacketHeader encoded_data_header_;
scoped_refptr<media::DataBuffer> encoded_data_;
// True if we have started receiving encoded data from the Encoder.