webrtc/api/peerconnection.cc - Issue 1610243002: Move talk/app/webrtc to webrtc/api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/peerconnection.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 months 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

Index: webrtc/api/peerconnection.cc

diff --git a/talk/app/webrtc/peerconnection.cc b/webrtc/api/peerconnection.cc

similarity index 98%

rename from talk/app/webrtc/peerconnection.cc

rename to webrtc/api/peerconnection.cc

index c423b0fadec634c7cf9e7f1f3b5ce27d7030d118..cdc5861ddd29ba237bdc7b51c74ebc3b864e9bfc 100644

--- a/talk/app/webrtc/peerconnection.cc

+++ b/webrtc/api/peerconnection.cc

@@ -25,30 +25,30 @@

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#include "talk/app/webrtc/peerconnection.h"

+#include "webrtc/api/peerconnection.h"

#include <algorithm>

#include <cctype> // for isdigit

#include <utility>

#include <vector>

-#include "talk/app/webrtc/audiotrack.h"

-#include "talk/app/webrtc/dtmfsender.h"

-#include "talk/app/webrtc/jsepicecandidate.h"

-#include "talk/app/webrtc/jsepsessiondescription.h"

-#include "talk/app/webrtc/mediaconstraintsinterface.h"

-#include "talk/app/webrtc/mediastream.h"

-#include "talk/app/webrtc/mediastreamobserver.h"

-#include "talk/app/webrtc/mediastreamproxy.h"

-#include "talk/app/webrtc/mediastreamtrackproxy.h"

-#include "talk/app/webrtc/remoteaudiosource.h"

-#include "talk/app/webrtc/remotevideocapturer.h"

-#include "talk/app/webrtc/rtpreceiver.h"

-#include "talk/app/webrtc/rtpsender.h"

-#include "talk/app/webrtc/streamcollection.h"

-#include "talk/app/webrtc/videosource.h"

-#include "talk/app/webrtc/videotrack.h"

#include "talk/session/media/channelmanager.h"

+#include "webrtc/api/audiotrack.h"

+#include "webrtc/api/dtmfsender.h"

+#include "webrtc/api/jsepicecandidate.h"

+#include "webrtc/api/jsepsessiondescription.h"

+#include "webrtc/api/mediaconstraintsinterface.h"

+#include "webrtc/api/mediastream.h"

+#include "webrtc/api/mediastreamobserver.h"

+#include "webrtc/api/mediastreamproxy.h"

+#include "webrtc/api/mediastreamtrackproxy.h"

+#include "webrtc/api/remoteaudiosource.h"

+#include "webrtc/api/remotevideocapturer.h"

+#include "webrtc/api/rtpreceiver.h"

+#include "webrtc/api/rtpsender.h"

+#include "webrtc/api/streamcollection.h"

+#include "webrtc/api/videosource.h"

+#include "webrtc/api/videotrack.h"

#include "webrtc/base/arraysize.h"

#include "webrtc/base/logging.h"

#include "webrtc/base/stringencode.h"

« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnection_unittest.cc » ('j') | no next file with comments »