Add VideoLayout message.

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 <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 323 matching lines @@
   // error was caused by some other problem.
   OnConnectionState(protocol::ConnectionToHost::FAILED,
                     protocol::INCOMPATIBLE_PROTOCOL);
 }
 
 void ChromotingInstance::OnVideoFirstFrameReceived() {
   PostLegacyJsonMessage("onFirstFrameReceived",
                         make_scoped_ptr(new base::DictionaryValue()));
 }
 
-void ChromotingInstance::OnVideoSize(const webrtc::DesktopSize& size,
-                                     const webrtc::DesktopVector& dpi) {
-  mouse_input_filter_.set_output_size(size);
-  touch_input_scaler_.set_output_size(size);
-
-  scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
-  data->SetInteger("width", size.width());
-  data->SetInteger("height", size.height());
-  if (dpi.x())
-    data->SetInteger("x_dpi", dpi.x());
-  if (dpi.y())
-    data->SetInteger("y_dpi", dpi.y());
-  PostLegacyJsonMessage("onDesktopSize", std::move(data));
-}
-
 void ChromotingInstance::OnVideoFrameDirtyRegion(
     const webrtc::DesktopRegion& dirty_region) {
   scoped_ptr<base::ListValue> rects_value(new base::ListValue());
   for (webrtc::DesktopRegion::Iterator i(dirty_region); !i.IsAtEnd();
        i.Advance()) {
     const webrtc::DesktopRect& rect = i.rect();
     scoped_ptr<base::ListValue> rect_value(new base::ListValue());
     rect_value->AppendInteger(rect.left());
     rect_value->AppendInteger(rect.top());
     rect_value->AppendInteger(rect.width());
@@ skipping 113 matching lines @@
 }
 
 void ChromotingInstance::DeliverHostMessage(
     const protocol::ExtensionMessage& message) {
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->SetString("type", message.type());
   data->SetString("data", message.data());
   PostLegacyJsonMessage("extensionMessage", std::move(data));
 }
 
+void ChromotingInstance::SetDesktopSize(const webrtc::DesktopSize& size,
+                                        const webrtc::DesktopVector& dpi) {
+  DCHECK(!dpi.is_zero());
+
+  mouse_input_filter_.set_output_size(size);
+  touch_input_scaler_.set_output_size(size);
+
+  scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
+  data->SetInteger("width", size.width());
+  data->SetInteger("height", size.height());
+  data->SetInteger("x_dpi", dpi.x());
+  data->SetInteger("y_dpi", dpi.y());
+  PostLegacyJsonMessage("onDesktopSize", std::move(data));
+}
+
 void ChromotingInstance::FetchSecretFromDialog(
     bool pairing_supported,
     const protocol::SecretFetchedCallback& secret_fetched_callback) {
   // Once the Session object calls this function, it won't continue the
   // authentication until the callback is called (or connection is canceled).
   // So, it's impossible to reach this with a callback already registered.
   DCHECK(secret_fetched_callback_.is_null());
   secret_fetched_callback_ = secret_fetched_callback;
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->SetBoolean("pairingSupported", pairing_supported);
@@ skipping 611 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting