Rename ClientDimensions to ClientResolution and add pixel-size and DPI fields.

This CL also updates the client and host protocol handlers to the new name.

BUG=172404


Review URL: https://chromiumcodereview.appspot.com/12220092

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

2 files changed, 14 insertions, 5 deletions

diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto
index 20f0b9d..e1c29ce 100644
--- a/remoting/proto/control.proto
+++ b/remoting/proto/control.proto
@@ -10,10 +10,19 @@ option optimize_for = LITE_RUNTIME;
 
 package remoting.protocol;
 
-message ClientDimensions {
-  // Width and height of the client.
-  optional int32 width = 1;
-  optional int32 height = 2;
+message ClientResolution {
+  // Legacy width and height of the client in Density-Independent Pixels
+  optional int32 dips_width = 1;
+  optional int32 dips_height = 2;
+
+  // Width and height of the client in device pixels.
+  optional int32 width = 3;
+  optional int32 height = 4;
+
+  // Horizontal and vertical DPI of the screen. If either of these is zero or
+  // unset, the corresponding DPI should be assumed to be 96 (Windows' default)
+  optional int32 x_dpi = 5;
+  optional int32 y_dpi = 6;
 }
 
 message VideoControl {
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 7f06f9d..21f32da 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -17,7 +17,7 @@ package remoting.protocol;
 // Represents a message being sent on the control channel.
 message ControlMessage {
   optional ClipboardEvent clipboard_event = 1;
-  optional ClientDimensions client_dimensions = 2;
+  optional ClientResolution client_resolution = 2;
   optional CursorShapeInfo cursor_shape = 4;
   optional VideoControl video_control = 3;
   optional AudioControl audio_control = 5;