Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: remoting/host/single_window_desktop_environment.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/desktop_capturer_proxy.cc ('k') | remoting/protocol/webrtc_video_renderer_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/single_window_desktop_environment.cc
diff --git a/remoting/host/single_window_desktop_environment.cc b/remoting/host/single_window_desktop_environment.cc
index 8456542e1a5d2ab82ad804234a864b476c90ca07..d638751efc911eb04853d194a9f738957cfa1432 100644
--- a/remoting/host/single_window_desktop_environment.cc
+++ b/remoting/host/single_window_desktop_environment.cc
@@ -33,10 +33,10 @@ class SingleWindowDesktopEnvironment : public BasicDesktopEnvironment {
scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- webrtc::WindowId window_id);
+ webrtc::DesktopCapturer::SourceId window_id);
private:
- webrtc::WindowId window_id_;
+ webrtc::DesktopCapturer::SourceId window_id_;
DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment);
};
@@ -51,11 +51,11 @@ SingleWindowDesktopEnvironment::CreateVideoCapturer() {
webrtc::DesktopCaptureOptions::CreateDefault();
options.set_use_update_notifications(true);
- std::unique_ptr<webrtc::WindowCapturer> window_capturer(
- webrtc::WindowCapturer::Create(options));
- window_capturer->SelectWindow(window_id_);
+ std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
+ webrtc::DesktopCapturer::CreateWindowCapturer(options));
+ window_capturer->SelectSource(window_id_);
- return std::move(window_capturer);
+ return window_capturer;
}
std::unique_ptr<InputInjector>
« no previous file with comments | « remoting/host/desktop_capturer_proxy.cc ('k') | remoting/protocol/webrtc_video_renderer_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698