Stub classes for Chromoting and use them in HostMessageDispatcher.
(Landing http://http://codereview.chromium.org/4167011 for hclam)
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/4336001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64818 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto
index 99b5d37..6e40658 100644
--- a/remoting/proto/control.proto
+++ b/remoting/proto/control.proto
@@ -8,26 +8,21 @@
option optimize_for = LITE_RUNTIME;
-package remoting;
+package remoting.protocol;
-message SuggestScreenResolutionRequest {
+// TODO(hclam): Isolate rectangle from these two messages.
+message SuggestResolutionRequest {
required int32 width = 1;
required int32 height = 2;
};
-// Represents a control message that sent from the client to the host.
-// This message is transmitted on the control channel.
-message ClientControlMessage {
- optional SuggestScreenResolutionRequest suggest_screen_resolution_request = 1;
-}
-
-message SetScreenResolutionRequest {
+message NotifyResolutionRequest {
required int32 width = 1;
required int32 height = 2;
};
-// Represents a control message that sent from host to the client.
-// This message is transmitted on the control channel.
-message HostControlMessage {
- optional SetScreenResolutionRequest set_screen_resolution_request = 1;
+// Represents a message being sent on the control channel.
+message ControlMessage {
+ optional SuggestResolutionRequest suggest_resolution = 1;
+ optional NotifyResolutionRequest notify_resolution = 2;
}
diff --git a/remoting/proto/event.proto b/remoting/proto/event.proto
index 2526d78..1f14c9dc 100644
--- a/remoting/proto/event.proto
+++ b/remoting/proto/event.proto
@@ -90,14 +90,7 @@
optional MouseEvent mouse = 4;
}
-// Defines the message that is sent from client to host.
-// Only one of the optional messages should be present.
-message ClientEventMessage {
- repeated Event events = 1;
-}
-
-// Defines the message that is sent from host to client.
-// Only one of the optional messages should be present.
-message HostEventMessage {
- // TODO(hclam): Define the message.
+// Message sent in the event channel.
+message EventMessage {
+ repeated Event event = 1;
}
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 3319420..fbe3181 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -6,7 +6,6 @@
syntax = "proto2";
-import "control.proto";
import "event.proto";
import "video.proto";
