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

Unified Diff: remoting/host/cast_extension_session.cc

Issue 1472703006: Move and rename host/cast_video_capture_adapter to protocol/webrtc_video_capture_adapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | remoting/host/cast_video_capturer_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/cast_extension_session.cc
diff --git a/remoting/host/cast_extension_session.cc b/remoting/host/cast_extension_session.cc
index 5b7e9a63f08a4730f26204f6cf5576fab2d371ab..1b8df914dee9adba2fb571bcde6ce0df778f3bb7 100644
--- a/remoting/host/cast_extension_session.cc
+++ b/remoting/host/cast_extension_session.cc
@@ -10,11 +10,11 @@
#include "base/logging.h"
#include "base/synchronization/waitable_event.h"
#include "net/url_request/url_request_context_getter.h"
-#include "remoting/host/cast_video_capturer_adapter.h"
#include "remoting/host/client_session.h"
#include "remoting/proto/control.pb.h"
#include "remoting/protocol/chromium_port_allocator_factory.h"
#include "remoting/protocol/client_stub.h"
+#include "remoting/protocol/webrtc_video_capturer_adapter.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
#include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"
#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
@@ -535,8 +535,8 @@ bool CastExtensionSession::SetupVideoStream(
return false;
}
- scoped_ptr<CastVideoCapturerAdapter> cast_video_capturer_adapter(
- new CastVideoCapturerAdapter(desktop_capturer.Pass()));
+ scoped_ptr<WebrtcVideoCapturerAdapter> video_capturer_adapter(
+ new WebrtcVideoCapturerAdapter(desktop_capturer.Pass()));
// Set video stream constraints.
webrtc::FakeConstraints video_constraints;
@@ -547,7 +547,7 @@ bool CastExtensionSession::SetupVideoStream(
peer_conn_factory_->CreateVideoTrack(
kVideoLabel,
peer_conn_factory_->CreateVideoSource(
- cast_video_capturer_adapter.release(), &video_constraints));
+ video_capturer_adapter.release(), &video_constraints));
stream_ = peer_conn_factory_->CreateLocalMediaStream(kStreamLabel);
« no previous file with comments | « no previous file | remoting/host/cast_video_capturer_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698