Move move classes to the remoting::protocol namespace. Minor cleanups.

BUG=None
TEST=compiles, unittests

Review URL: http://codereview.chromium.org/5068001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68056 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 25 deletions

diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto
index 6e40658..b53775f 100644
--- a/remoting/proto/control.proto
+++ b/remoting/proto/control.proto
@@ -20,9 +20,3 @@ message NotifyResolutionRequest {
   required int32 width = 1;
   required int32 height = 2;
 };
-
-// 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 887f77f..f4cc690 100644
--- a/remoting/proto/event.proto
+++ b/remoting/proto/event.proto
@@ -8,7 +8,7 @@ syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
-package remoting;
+package remoting.protocol;
 
 // Defines a keyboard event.
 // NEXT ID: 3
@@ -18,15 +18,16 @@ message KeyEvent {
   required bool pressed = 2;
 }
 
-enum MouseButton {
-  MouseButtonUndefined = 0;
-  MouseButtonLeft = 1;
-  MouseButtonMiddle = 2;
-  MouseButtonRight = 3;
-}
-
 // Defines a mouse event message on the event channel. 
 message MouseEvent {
+
+  enum MouseButton {
+    BUTTON_UNDEFINED = 0;
+    BUTTON_LEFT = 1;
+    BUTTON_MIDDLE = 2;
+    BUTTON_RIGHT = 3;
+  }
+
   // Mouse position information.
   optional int32 x = 1;
   optional int32 y = 2;
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 6949375..7c4385b 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -9,11 +9,16 @@ syntax = "proto2";
 
 import "control.proto";
 import "event.proto";
-import "video.proto";
 
 option optimize_for = LITE_RUNTIME;
 
-package remoting;
+package remoting.protocol;
+
+// Represents a message being sent on the control channel.
+message ControlMessage {
+  optional SuggestResolutionRequest suggest_resolution = 1;
+  optional NotifyResolutionRequest notify_resolution = 2;
+}
 
 // TODO(garykac) This is dead, remove remaining references and delete.
 message ChromotingClientMessage {
diff --git a/remoting/proto/video.proto b/remoting/proto/video.proto
index b193461c..e1cf5cf 100644
--- a/remoting/proto/video.proto
+++ b/remoting/proto/video.proto
@@ -10,15 +10,6 @@ option optimize_for = LITE_RUNTIME;
 
 package remoting;
 
-// A message that gets sent to the client after the client is connected to the
-// host. It contains information that the client needs to know about the host.
-// NEXT ID: 3
-// TODO(sergeyu): Move to the control channel.
-message InitClientMessage {
-  required int32 width = 1;
-  required int32 height = 2;
-}
-
 // TODO(ajwong): Determine if these fields should be optional or required.
 message VideoPacketFormat {
   // Identifies how the image was encoded.