talk/app/webrtc/mediacontroller.cc - Issue 1308543007: Add placeholder files for talk/app/webrtc/mediacontroller.cc/.h to be able to update Chrome's libji…

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: talk/app/webrtc/mediacontroller.cc

Issue 1308543007: Add placeholder files for talk/app/webrtc/mediacontroller.cc/.h to be able to update Chrome's libji… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 3 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: talk/app/webrtc/mediacontroller.cc

diff --git a/talk/session/media/voicechannel.h b/talk/app/webrtc/mediacontroller.cc

similarity index 88%

copy from talk/session/media/voicechannel.h

copy to talk/app/webrtc/mediacontroller.cc

index 6c1b6afdd55aab2df3325297afe0efde2b76b727..33db3ac8f2bb39e2cba44276286a53a083d271a0 100644

--- a/talk/session/media/voicechannel.h

+++ b/talk/app/webrtc/mediacontroller.cc

@@ -1,6 +1,6 @@

* libjingle

* Redistribution and use in source and binary forms, with or without

* modification, are permitted provided that the following conditions are met:

@@ -25,9 +25,7 @@

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#ifndef _VOICECHANNEL_H_

-#define _VOICECHANNEL_H_

+// Place holder file to be able to update Chrome's libjingle.gyp before the real

+// implementation goes in.

-#include "talk/session/media/channel.h"

-#endif // _VOICECHANNEL_H_

+#include "talk/app/webrtc/mediacontroller.h"

« no previous file with comments | « talk/app/webrtc/mediacontroller.h ('k') | no next file » | no next file with comments »