summaryrefslogtreecommitdiffstats
path: root/remoting/host/mock_objects.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/mock_objects.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/mock_objects.h')
-rw-r--r--remoting/host/mock_objects.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/mock_objects.h b/remoting/host/mock_objects.h
index 1f33263..d492376 100644
--- a/remoting/host/mock_objects.h
+++ b/remoting/host/mock_objects.h
@@ -27,7 +27,7 @@ class MockCapturer : public Capturer {
MOCK_CONST_METHOD1(GetDirtyRects, void(DirtyRects* rects));
MOCK_CONST_METHOD0(GetWidth, int());
MOCK_CONST_METHOD0(GetHeight, int());
- MOCK_CONST_METHOD0(GetPixelFormat, chromotocol_pb::PixelFormat());
+ MOCK_CONST_METHOD0(GetPixelFormat, PixelFormat());
private:
DISALLOW_COPY_AND_ASSIGN(MockCapturer);
@@ -42,12 +42,12 @@ class MockEncoder : public Encoder {
const uint8** planes,
const int* strides,
bool key_frame,
- chromotocol_pb::UpdateStreamPacketHeader* output_data_header,
+ UpdateStreamPacketHeader* output_data_header,
scoped_refptr<media::DataBuffer>* output_data,
bool* encode_done,
Task* data_available_task));
MOCK_METHOD2(SetSize, void(int width, int height));
- MOCK_METHOD1(SetPixelFormat, void(chromotocol_pb::PixelFormat pixel_format));
+ MOCK_METHOD1(SetPixelFormat, void(PixelFormat pixel_format));
private:
DISALLOW_COPY_AND_ASSIGN(MockEncoder);
@@ -70,7 +70,7 @@ class MockClientConnection : public ClientConnection {
MOCK_METHOD2(SendInitClientMessage, void(int width, int height));
MOCK_METHOD0(SendBeginUpdateStreamMessage, void());
MOCK_METHOD2(SendUpdateStreamPacketMessage,
- void(chromotocol_pb::UpdateStreamPacketHeader* header,
+ void(UpdateStreamPacketHeader* header,
scoped_refptr<media::DataBuffer> data));
MOCK_METHOD0(SendEndUpdateStreamMessage, void());
MOCK_METHOD0(GetPendingUpdateStreamMessages, int());