Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/chromeos/aura_screen_capturer.h

Index: remoting/host/chromeos/aura_screen_capturer.h
diff --git a/remoting/host/chromeos/aura_desktop_capturer.h b/remoting/host/chromeos/aura_screen_capturer.h
similarity index 56%
rename from remoting/host/chromeos/aura_desktop_capturer.h
rename to remoting/host/chromeos/aura_screen_capturer.h
index 4ccd5db8a20128df2fee7222dd95f4543dec470e..eb82052c2506d0deac78efea3c02fdd3895f642d 100644
--- a/remoting/host/chromeos/aura_desktop_capturer.h
+++ b/remoting/host/chromeos/aura_screen_capturer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
-#define REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
+#ifndef REMOTING_HOST_CHROMEOS_AURA_SCREEN_CAPTURER_H_
+#define REMOTING_HOST_CHROMEOS_AURA_SCREEN_CAPTURER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
@@ -18,21 +18,25 @@ class Window;
 
 namespace remoting {
 
-// A webrtc::DesktopCapturer that captures pixels from the root window of the
+// A webrtc::ScreenCapturer that captures pixels from the root window of the
 // Aura Shell.  This is implemented by requesting the layer and its substree to
 // be rendered to a given data structure.  Start() and Capture() must be called
 // on the Browser UI thread.
-class AuraDesktopCapturer : public webrtc::DesktopCapturer {
+class AuraScreenCapturer : public webrtc::ScreenCapturer {
  public:
-  AuraDesktopCapturer();
-  virtual ~AuraDesktopCapturer();
+  AuraScreenCapturer();
+  ~AuraScreenCapturer() override;
 
   // webrtc::DesktopCapturer implementation.
-  virtual void Start(webrtc::DesktopCapturer::Callback* callback) override;
-  virtual void Capture(const webrtc::DesktopRegion& region) override;
+  void Start(webrtc::DesktopCapturer::Callback* callback) override;
+  void Capture(const webrtc::DesktopRegion& region) override;
+
+  // webrtc::ScreenCapturer implementation.
+  bool GetScreenList(ScreenList* screens) override;
+  bool SelectScreen(webrtc::ScreenId id) override;
 
  private:
-  friend class AuraDesktopCapturerTest;
+  friend class AuraScreenCapturerTest;
 
   // Called when a copy of the layer is captured.
   void OnFrameCaptured(scoped_ptr<cc::CopyOutputResult> result);
@@ -43,11 +47,11 @@ class AuraDesktopCapturer : public webrtc::DesktopCapturer {
   // The root window of the Aura Shell.
   aura::Window* desktop_window_;
 
-  base::WeakPtrFactory<AuraDesktopCapturer> weak_factory_;
+  base::WeakPtrFactory<AuraScreenCapturer> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(AuraDesktopCapturer);
+  DISALLOW_COPY_AND_ASSIGN(AuraScreenCapturer);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_CHROMEOS_AURA_DESKTOP_CAPTURER_H_
+#endif  // REMOTING_HOST_CHROMEOS_AURA_SCREEN_CAPTURER_H_