Add glue between the client and engine for Blimp

blimp/common/proto/blimp_message.proto

Index: blimp/common/proto/blimp_message.proto
diff --git a/blimp/common/proto/blimp_message.proto b/blimp/common/proto/blimp_message.proto
index e81c608f09633d6128cb752d01ea213d6f93863d..55fc57839ed1aff98c120e20ffcbc20137d62946 100644
--- a/blimp/common/proto/blimp_message.proto
+++ b/blimp/common/proto/blimp_message.proto
@@ -18,7 +18,6 @@
 // * Features are applied to unidirectional channels. Client->server and
 //   server->client channels for a component should be broken out as distinct
 //   features, even if they are conceptually similar.
-// * Shared proto types are contained in 'common.proto'.
 
 syntax = "proto2";
 
@@ -28,15 +27,17 @@ import "control.proto";
 import "compositor.proto";
 import "input.proto";
 import "navigation.proto";
+import "render_widget.proto";
 
 package blimp;
 
 message BlimpMessage {
   enum Type {
-    COMPOSITOR = 0;
-    INPUT = 1;
-    CONTROL = 2;
-    NAVIGATION = 3;
+    CONTROL = 0;
+    NAVIGATION = 1;
+    RENDER_WIDGET = 2;
+    INPUT = 3;
+    COMPOSITOR = 4;
   }
   // Identifies the feature type of this message.
   // The feature-specific contents are contained in optional fields of the same
@@ -57,9 +58,10 @@ message BlimpMessage {
   // Feature-specific messages follow.
   // Only one of these fields may be set per BlimpMessage.
   // TODO(kmarshall): use a 'oneof' union when it's supported in Chromium.
-  optional CompositorMessage compositor = 1000;
-  optional InputMessage input = 1001;
-  optional ControlMessage control = 1002;
-  optional NavigationMessage navigation = 1003;
+  optional ControlMessage control = 1000;
+  optional NavigationMessage navigation = 1001;
+  optional RenderWidgetMessage render_widget = 1002;
+  optional InputMessage input = 1003;
+  optional CompositorMessage compositor = 1004;
 }