Add VideoLayout message.

remoting/protocol/webrtc_video_capturer_adapter.cc

 // Copyright 2015 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/protocol/webrtc_video_capturer_adapter.h"
 
 #include <utility>
 
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/webrtc/media/engine/webrtcvideoframe.h"
@@ skipping 12 matching lines @@
 
   // Disable video adaptation since we don't intend to use it.
   set_enable_video_adapter(false);
 }
 
 WebrtcVideoCapturerAdapter::~WebrtcVideoCapturerAdapter() {
   DCHECK(!capture_timer_);
 }
 
 void WebrtcVideoCapturerAdapter::SetSizeCallback(
-    const SizeCallback& size_callback) {
+    const VideoStream::SizeCallback& size_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   size_callback_ = size_callback;
 }
 
 base::WeakPtr<WebrtcVideoCapturerAdapter>
 WebrtcVideoCapturerAdapter::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 bool WebrtcVideoCapturerAdapter::GetBestCaptureFormat(
@@ skipping 118 matching lines @@
   // nothing is changing on the screen. This is necessary because the video
   // sender drops frames. Obviously this is a suboptimal. The sending code in
   // WebRTC needs to have some mechanism to notify when the bandwidth is
   // exceeded, so the capturer can adapt frame rate.
 
   size_t width = frame->size().width();
   size_t height = frame->size().height();
   if (!yuv_frame_ || yuv_frame_->GetWidth() != width ||
       yuv_frame_->GetHeight() != height) {
     if (!size_callback_.is_null())
-      size_callback_.Run(frame->size());
+      size_callback_.Run(frame->size(), frame->dpi());
 
     scoped_ptr<cricket::WebRtcVideoFrame> webrtc_frame(
         new cricket::WebRtcVideoFrame());
     webrtc_frame->InitToEmptyBuffer(width, height, 0);
     yuv_frame_ = std::move(webrtc_frame);
 
     // Set updated_region so the whole frame is converted to YUV below.
     frame->mutable_updated_region()->SetRect(
         webrtc::DesktopRect::MakeWH(width, height));
   }
@@ skipping 39 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (capture_pending_)
     return;
   capture_pending_ = true;
   desktop_capturer_->Capture(webrtc::DesktopRegion());
 }
 
 }  // namespace protocol
 }  // namespace remoting