Rolling webrtc/libjingle r5389.

R=jiayl@chromium.org, sergeyu@chromium.org, wjia@chromium.org

Review URL: https://codereview.chromium.org/139853002

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

7 files changed, 45 insertions, 0 deletions

diff --git a/remoting/host/ipc_video_frame_capturer.cc b/remoting/host/ipc_video_frame_capturer.cc
index b4120e1..c56c20e 100644
--- a/remoting/host/ipc_video_frame_capturer.cc
+++ b/remoting/host/ipc_video_frame_capturer.cc
@@ -36,6 +36,16 @@ void IpcVideoFrameCapturer::SetMouseShapeObserver(
   mouse_shape_observer_ = mouse_shape_observer;
 }
 
+bool IpcVideoFrameCapturer::GetScreenList(ScreenList* screens) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool IpcVideoFrameCapturer::SelectScreen(webrtc::ScreenId id) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 void IpcVideoFrameCapturer::Capture(const webrtc::DesktopRegion& region) {
   DCHECK(!capture_pending_);
   capture_pending_ = true;
diff --git a/remoting/host/ipc_video_frame_capturer.h b/remoting/host/ipc_video_frame_capturer.h
index 1014604..616f0a2 100644
--- a/remoting/host/ipc_video_frame_capturer.h
+++ b/remoting/host/ipc_video_frame_capturer.h
@@ -38,6 +38,10 @@ class IpcVideoFrameCapturer : public webrtc::ScreenCapturer {
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE;
 
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE;
+
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE;
+
   // Called when a video |frame| has been captured.
   void OnCaptureCompleted(scoped_ptr<webrtc::DesktopFrame> frame);
 
diff --git a/remoting/host/screen_capturer_fake.cc b/remoting/host/screen_capturer_fake.cc
index 94b8c90..b32ec2b 100644
--- a/remoting/host/screen_capturer_fake.cc
+++ b/remoting/host/screen_capturer_fake.cc
@@ -82,6 +82,16 @@ void ScreenCapturerFake::SetMouseShapeObserver(
   mouse_shape_observer_ = mouse_shape_observer;
 }
 
+bool ScreenCapturerFake::GetScreenList(ScreenList* screens) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ScreenCapturerFake::SelectScreen(webrtc::ScreenId id) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 void ScreenCapturerFake::GenerateImage() {
   webrtc::DesktopFrame* frame = queue_.current_frame();
 
diff --git a/remoting/host/screen_capturer_fake.h b/remoting/host/screen_capturer_fake.h
index ab99146..fe1660b 100644
--- a/remoting/host/screen_capturer_fake.h
+++ b/remoting/host/screen_capturer_fake.h
@@ -32,6 +32,8 @@ class ScreenCapturerFake : public webrtc::ScreenCapturer {
   // ScreenCapturer interface.
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE;
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE;
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE;
 
  private:
   // Generates an image in the front buffer.
diff --git a/remoting/host/shaped_screen_capturer.cc b/remoting/host/shaped_screen_capturer.cc
index 0602524..00e808f 100644
--- a/remoting/host/shaped_screen_capturer.cc
+++ b/remoting/host/shaped_screen_capturer.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/host/shaped_screen_capturer.h"
 
+#include "base/logging.h"
 #include "remoting/host/desktop_shape_tracker.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
@@ -43,6 +44,16 @@ void ShapedScreenCapturer::SetMouseShapeObserver(
   screen_capturer_->SetMouseShapeObserver(mouse_shape_observer);
 }
 
+bool ShapedScreenCapturer::GetScreenList(ScreenList* screens) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ShapedScreenCapturer::SelectScreen(webrtc::ScreenId id) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 webrtc::SharedMemory* ShapedScreenCapturer::CreateSharedMemory(size_t size) {
   return callback_->CreateSharedMemory(size);
 }
diff --git a/remoting/host/shaped_screen_capturer.h b/remoting/host/shaped_screen_capturer.h
index 9751086..c343293 100644
--- a/remoting/host/shaped_screen_capturer.h
+++ b/remoting/host/shaped_screen_capturer.h
@@ -28,6 +28,8 @@ class ShapedScreenCapturer : public webrtc::ScreenCapturer,
   virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE;
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE;
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE;
 
  private:
   // webrtc::ScreenCapturer::Callback interface.
diff --git a/remoting/host/shaped_screen_capturer_unittest.cc b/remoting/host/shaped_screen_capturer_unittest.cc
index 8a24673..f6b7da2 100644
--- a/remoting/host/shaped_screen_capturer_unittest.cc
+++ b/remoting/host/shaped_screen_capturer_unittest.cc
@@ -33,6 +33,12 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE {
   }
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE {
+    return false;
+  }
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE {
+    return false;
+  }
 
  private:
   Callback* callback_;