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

remoting/client/plugin/chromoting_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 36 matching lines @@
 #undef PostMessage
 #endif
 
 namespace remoting {
 
 namespace {
 
 // 32-bit BGRA is 4 bytes per pixel.
 const int kBytesPerPixel = 4;
 
+// Default DPI to assume for old clients that use notifyClientDimensions.
+const int kDefaultDPI = 96;
+
+// Interval at which to sample performance statistics.
 const int kPerfStatsIntervalMs = 1000;
 
 // URL scheme used by Chrome apps and extensions.
 const char kChromeExtensionUrlScheme[] = "chrome-extension";
 
 std::string ConnectionStateToString(protocol::ConnectionToHost::State state) {
   // Values returned by this function must match the
   // remoting.ClientSession.State enum in JS code.
   switch (state) {
     case protocol::ConnectionToHost::INITIALIZING:
@@ skipping 515 matching lines @@
                                            const std::string& item) {
   if (!IsConnected()) {
     return;
   }
   protocol::ClipboardEvent event;
   event.set_mime_type(mime_type);
   event.set_data(item);
   host_connection_->clipboard_stub()->InjectClipboardEvent(event);
 }
 
-void ChromotingInstance::NotifyClientDimensions(int width, int height) {
+void ChromotingInstance::NotifyClientDimensions(int width, int height)

[Jamie, 2013/02/11 20:35:37]

This won't compile, surely? There's no opening brace, and you've removed
NotifyClientDimensions from the class definition.

   if (!IsConnected()) {
     return;
   }
-  protocol::ClientDimensions client_dimensions;
-  client_dimensions.set_width(width);
-  client_dimensions.set_height(height);
-  host_connection_->host_stub()->NotifyClientDimensions(client_dimensions);
+
+  protocol::ClientResolution client_resolution;
+  client_resolution.set_width(width);
+  client_resolution.set_height(height);
+  client_resolution.set_x_dpi(kDefaultDPI);
+  client_resolution.set_y_dpi(kDefaultDPI);
+
+  // Include the legacy width & height for use by older hosts.
+  client_resolution.set_dips_width(width);
+  client_resolution.set_dips_height(height);
+
+  host_connection_->host_stub()->NotifyClientResolution(client_resolution);
 }
 
 void ChromotingInstance::PauseVideo(bool pause) {
   if (!IsConnected()) {
     return;
   }
   protocol::VideoControl video_control;
   video_control.set_enable(!pause);
   host_connection_->host_stub()->ControlVideo(video_control);
 }
@@ skipping 176 matching lines @@
                                       url_components.scheme.len);
   return url_scheme == kChromeExtensionUrlScheme;
 }
 
 bool ChromotingInstance::IsConnected() {
   return host_connection_.get() &&
     (host_connection_->state() == protocol::ConnectionToHost::CONNECTED);
 }
 
 }  // namespace remoting